move frontends into sub directory

1129 files changed, 398 insertions, 534 deletions

diff --git a/.gitignore b/.gitignore
index 4102f3eee..89ecd0d0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 *~
-gtk/res/toolbarIndices
-windows/res/preferences
 \!NetSurf/!Run,feb
 \!NetSurf/!RunImage,ff8
 \!NetSurf/!Help,feb
@@ -13,11 +11,13 @@ windows/res/preferences
 \!NetSurf/Resources/nl/Templates,fec
 \!NetSurf/Resources/nl/Messages
 \!NetSurf/Resources/it/Messages
-gtk/res/en/Messages
-gtk/res/fr/Messages
-gtk/res/de/Messages
-gtk/res/nl/Messages
-gtk/res/it/Messages
+frontends/windows/res/preferences
+frontends/gtk/res/toolbarIndices
+frontends/gtk/res/en/Messages
+frontends/gtk/res/fr/Messages
+frontends/gtk/res/de/Messages
+frontends/gtk/res/nl/Messages
+frontends/gtk/res/it/Messages
 test/nsoption
 test/nsurl
 test/urldbtest
diff --git a/Makefile b/Makefile
index d0c072372..c8cf35e45 100644
--- a/Makefile
+++ b/Makefile
@@ -511,13 +511,36 @@ $(eval $(call pkg_config_find_and_add,libcss,CSS))
 $(eval $(call pkg_config_find_and_add,libdom,DOM))
 $(eval $(call pkg_config_find_and_add,libnsutils,nsutils))
 $(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc))
+$(eval $(call pkg_config_find_and_add,openssl,OpenSSL))
+# freemint does not support pkg-config for libcurl
+ifeq ($(HOST),mint)
+    CFLAGS += $(shell curl-config --cflags)
+    LDFLAGS += $(shell curl-config --libs)
+else
+    $(eval $(call pkg_config_find_and_add,libcurl,Curl))
+endif
 
 # Common libraries without pkg-config support
 LDFLAGS += -lz
 
+# Optional libraries with pkgconfig
+
+# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs
+NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
+NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
+NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
+NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
+NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
+
+$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG))
+$(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,NSSVG,libsvgtiny,SVG))
+$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
+
 # add top level and build directory to include search path
-CFLAGS += -I. -I$(OBJROOT)
-CXXFLAGS += -I. -I$(OBJROOT)
+CFLAGS += -I. -Ifrontends -I$(OBJROOT)
+CXXFLAGS += -I. -Ifrontends -I$(OBJROOT)
 
 # export the user agent format
 CFLAGS += -DNETSURF_UA_FORMAT_STRING=\"$(NETSURF_UA_FORMAT_STRING)\"
@@ -553,7 +576,7 @@ POSTEXES :=
 # Target specific setup
 # ----------------------------------------------------------------------------
 
-include $(TARGET)/Makefile.target
+include frontends/Makefile
 
 # ----------------------------------------------------------------------------
 # General source file setup
@@ -647,10 +670,10 @@ else
 	$(Q)$(RM) $(EXETARGET:,ff8=,e1f)
 endif
 ifeq ($(TARGET),windows)
-	$(Q)$(TOUCH) windows/res/preferences
+	$(Q)$(TOUCH) frontends/windows/res/preferences
 endif
 ifeq ($(TARGET),gtk)
-	$(Q)$(TOUCH) gtk/res/toolbarIndices
+	$(Q)$(TOUCH) frontends/gtk/res/toolbarIndices
 endif
 ifeq ($(NETSURF_STRIP_BINARY),YES)
 	$(VQ)echo "   STRIP: $(EXETARGET)"
diff --git a/Makefile.defaults b/Makefile.defaults
index 09ac2243e..196e19236 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -125,7 +125,7 @@ endif
 # ----------------------------------------------------------------------------
 # Option overrides determined by specific TARGET
 # ----------------------------------------------------------------------------
--include $(TARGET)/Makefile.defaults
+-include frontends/$(TARGET)/Makefile.defaults
 
 
 # ----------------------------------------------------------------------------
diff --git a/beos/Makefile.target b/beos/Makefile.target
deleted file mode 100644
index 382b32736..000000000
--- a/beos/Makefile.target
+++ /dev/null
@@ -1,156 +0,0 @@
-# ----------------------------------------------------------------------------
-# BeOS target setup
-# ----------------------------------------------------------------------------
-
-$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng)  ))
-$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny)))
-
-# Linker flags
-LDFLAGS += -L/boot/home/config/lib
-# for Haiku
-LDFLAGS += -L/boot/common/lib
-LDFLAGS += -lssl -lcrypto -lcss
-LDFLAGS += -ldom -lparserutils -lhubbub -lwapcaplet
-LDFLAGS += -lexpat -lcurl
-
-COMMON_WARNFLAGS += -Wno-multichar
-
-# compiler flags
-CFLAGS += -std=c99 -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g
-CXXFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g
-
-BEOS_BERES := beres
-BEOS_RC := rc
-BEOS_XRES := xres
-BEOS_SETVER := setversion
-BEOS_MIMESET := mimeset
-
-VERSION_FULL := $(shell sed -n '/_version.*=.*"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c)
-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)
-
-ifeq ($(HOST),beos)
-  CFLAGS += -I/boot/home/config/include		\
-		-I/boot/home/config/include/hubbub	\
-		-I/boot/home/config/include/libcss	\
-		-I/boot/home/config/include/parserutils
-  CXXFLAGS += -I/boot/home/config/include		\
-		-I/boot/home/config/include/hubbub	\
-		-I/boot/home/config/include/libcss	\
-		-I/boot/home/config/include/parserutils
-  ifneq ($(wildcard /boot/develop/lib/*/libzeta.so),)
-    LDFLAGS += -lzeta
-  endif
-  ifneq ($(wildcard /boot/system/develop/lib/libnetwork.so),)
-      # Haiku
-      NETLDFLAGS := -lnetwork
-  else
-    ifneq ($(wildcard /boot/develop/lib/*/libbind.so),)
-        # BONE
-        NETLDFLAGS := -lsocket -lbind
-    else
-        # net_server, will probably never work
-        NETLDFLAGS := -lnet
-    endif
-  endif
-else
-    # cross: Haiku ?
-    NETLDFLAGS := -lnetwork
-endif
-
-LDFLAGS += -lbe -ltranslation -ltracker -lcolumnlistview $(NETLDFLAGS)
-ifeq ($(CC_MAJOR),2)
-    LDFLAGS += -lstdc++.r4
-else
-    LDFLAGS += -lstdc++ -lsupc++
-endif
-
-ifeq ($(HOST),beos)
-  CFLAGS += -I$(PREFIX)/include
-  CXXFLAGS += -I$(PREFIX)/include
-  LDFLAGS += -L$(PREFIX)/lib
-  $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp)))
-  $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif)))
-  $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng)  ))
-else
-  NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
-  NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
-  NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
-  $(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  ))
-endif
-
-# ----------------------------------------------------------------------------
-# Source file setup
-# ----------------------------------------------------------------------------
-
-# S_BEOS are sources purely for the BeOS build
-S_BEOS := about.cpp bitmap.cpp cookies.cpp \
-	download.cpp fetch_rsrc.cpp filetype.cpp \
-	font.cpp gui.cpp login.cpp gui_options.cpp plotters.cpp		\
-	scaffolding.cpp search.cpp schedule.cpp throbber.cpp window.cpp
-S_BEOS := $(addprefix beos/,$(S_BEOS))
-
-RDEF_BEOS := res.rdef
-RDEF_BEOS := $(addprefix beos/,$(RDEF_BEOS))
-
-RDEF_IMP_BEOS := res_import.rdef
-RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS)))
-
-RDEP_BEOS := \
-	adblock.css beosdefault.css default.css internal.css quirks.css	\
-	netsurf.png favicon.png ca-bundle.txt \
-	credits.html licence.html welcome.html maps.html SearchEngines
-RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS))			\
-	$(wildcard beos/res/icons/*.png)						\
-	$(wildcard beos/res/??/*)								\
-	$(wildcard beos/res/throbber/throbber*.png)
-
-
-# This is the final source build list
-# Note this is deliberately *not* expanded here as common and image
-#   are not yet available
-SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
-EXETARGET := NetSurf
-
-# The filter and target for split messages
-MESSAGES_FILTER=beos
-MESSAGES_TARGET=beos/res
-
-# ----------------------------------------------------------------------------
-# Resources
-# ----------------------------------------------------------------------------
-
-RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS))))
-RESOURCES = $(RSRC_BEOS)
-
-$(RDEF_IMP_BEOS): $(RDEP_BEOS)
-	$(VQ)echo "     GEN: $@"
-	$(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") #'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@
-
-$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
-	$(VQ)echo "      RC: $<"
-	$(Q)$(BEOS_RC) -I beos -o $@ $^
-
-
-# ----------------------------------------------------------------------------
-# Install target
-# ----------------------------------------------------------------------------
-
-install-beos:
-	mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
-	mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-	@copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
-	@cp -vRL beos/res/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-	@cp -vRL beos/res/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-	@cp -vRL beos/res/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-	@cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-	@cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-	@cp -vRL beos/res/SearchEngines $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-
-# ----------------------------------------------------------------------------
-# Package target
-# ----------------------------------------------------------------------------
-
-package-beos:
diff --git a/cocoa/res/Icons b/cocoa/res/Icons
deleted file mode 120000
index 509ccd1d2..000000000
--- a/cocoa/res/Icons
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/Icons/
\ No newline at end of file
diff --git a/cocoa/res/adblock.css b/cocoa/res/adblock.css
deleted file mode 120000
index e3811f62b..000000000
--- a/cocoa/res/adblock.css
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/AdBlock,f79
\ No newline at end of file
diff --git a/cocoa/res/ca-bundle b/cocoa/res/ca-bundle
deleted file mode 120000
index ad2dd6b55..000000000
--- a/cocoa/res/ca-bundle
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/ca-bundle
\ No newline at end of file
diff --git a/cocoa/res/de.lproj/Messages b/cocoa/res/de.lproj/Messages
deleted file mode 120000
index 2f1fc39c3..000000000
--- a/cocoa/res/de.lproj/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/de/Messages
\ No newline at end of file
diff --git a/cocoa/res/default.css b/cocoa/res/default.css
deleted file mode 120000
index 6d2d4da5b..000000000
--- a/cocoa/res/default.css
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/CSS,f79
\ No newline at end of file
diff --git a/cocoa/res/fr.lproj/Messages b/cocoa/res/fr.lproj/Messages
deleted file mode 120000
index a42cf08f4..000000000
--- a/cocoa/res/fr.lproj/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/fr/Messages
\ No newline at end of file
diff --git a/cocoa/res/internal.css b/cocoa/res/internal.css
deleted file mode 120000
index e777d8ae1..000000000
--- a/cocoa/res/internal.css
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/internal.css,f79
\ No newline at end of file
diff --git a/cocoa/res/it.lproj/Messages b/cocoa/res/it.lproj/Messages
deleted file mode 120000
index d4c5c2956..000000000
--- a/cocoa/res/it.lproj/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/it/Messages
\ No newline at end of file
diff --git a/cocoa/res/netsurf.png b/cocoa/res/netsurf.png
deleted file mode 120000
index 0fbf42709..000000000
--- a/cocoa/res/netsurf.png
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/netsurf.png,b60
\ No newline at end of file
diff --git a/cocoa/res/nl.lproj/Messages b/cocoa/res/nl.lproj/Messages
deleted file mode 120000
index d484ebd29..000000000
--- a/cocoa/res/nl.lproj/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/nl/Messages
\ No newline at end of file
diff --git a/cocoa/res/quirks.css b/cocoa/res/quirks.css
deleted file mode 120000
index d9fb80334..000000000
--- a/cocoa/res/quirks.css
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/Quirks,f79
\ No newline at end of file
diff --git a/framebuffer/res/Messages b/framebuffer/res/Messages
deleted file mode 120000
index f4a4d2bba..000000000
--- a/framebuffer/res/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/en/Messages
\ No newline at end of file
diff --git a/framebuffer/res/adblock.css b/framebuffer/res/adblock.css
deleted file mode 120000
index e3811f62b..000000000
--- a/framebuffer/res/adblock.css
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/AdBlock,f79
\ No newline at end of file
diff --git a/framebuffer/res/credits.html b/framebuffer/res/credits.html
deleted file mode 120000
index db395bb5a..000000000
--- a/framebuffer/res/credits.html
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/en/credits.html,faf
\ No newline at end of file
diff --git a/framebuffer/res/default.css b/framebuffer/res/default.css
deleted file mode 120000
index 6d2d4da5b..000000000
--- a/framebuffer/res/default.css
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/CSS,f79
\ No newline at end of file
diff --git a/framebuffer/res/favicon.png b/framebuffer/res/favicon.png
deleted file mode 120000
index d968c3827..000000000
--- a/framebuffer/res/favicon.png
+++ /dev/null
@@ -1 +0,0 @@
-../../gtk/res/favicon.png
\ No newline at end of file
diff --git a/framebuffer/res/internal.css b/framebuffer/res/internal.css
deleted file mode 120000
index e777d8ae1..000000000
--- a/framebuffer/res/internal.css
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/internal.css,f79
\ No newline at end of file
diff --git a/framebuffer/res/licence.html b/framebuffer/res/licence.html
deleted file mode 120000
index a5f990304..000000000
--- a/framebuffer/res/licence.html
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/en/licence.html,faf
\ No newline at end of file
diff --git a/framebuffer/res/maps.html b/framebuffer/res/maps.html
deleted file mode 120000
index 5b394445b..000000000
--- a/framebuffer/res/maps.html
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/en/welcome.html,faf
\ No newline at end of file
diff --git a/framebuffer/res/netsurf.png b/framebuffer/res/netsurf.png
deleted file mode 120000
index 0fbf42709..000000000
--- a/framebuffer/res/netsurf.png
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/netsurf.png,b60
\ No newline at end of file
diff --git a/framebuffer/res/quirks.css b/framebuffer/res/quirks.css
deleted file mode 120000
index d9fb80334..000000000
--- a/framebuffer/res/quirks.css
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/Quirks,f79
\ No newline at end of file
diff --git a/framebuffer/res/welcome.html b/framebuffer/res/welcome.html
deleted file mode 120000
index 5b394445b..000000000
--- a/framebuffer/res/welcome.html
+++ /dev/null
@@ -1 +0,0 @@
-../../!NetSurf/Resources/en/welcome.html,faf
\ No newline at end of file
diff --git a/frontends/Makefile b/frontends/Makefile
new file mode 100644
index 000000000..da6fe2019
--- /dev/null
+++ b/frontends/Makefile
@@ -0,0 +1,9 @@
+# NetSurf Frontend sources
+
+FRONTEND_SOURCE_DIR := frontends/$(TARGET)
+FRONTEND_RESOURCES_DIR := frontends/$(TARGET)/res
+
+# Target Specific setup
+include frontends/$(TARGET)/Makefile
+
+S_FRONTEND := $(addprefix frontends/$(TARGET)/,$(S_FRONTEND))
diff --git a/amiga/Makefile.target b/frontends/amiga/Makefile
index 54957f778..a5e9d1c1f 100644
--- a/amiga/Makefile.target
+++ b/frontends/amiga/Makefile
@@ -33,17 +33,10 @@ ifeq ($(HOST),amiga)
   LDFLAGS += -lcurl -lrtmp -lpthread -ltre -lintl -lpbl
   LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet
 else
-  $(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
-  $(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,NSSVG))
-  $(eval $(call feature_enabled,MOZJS,-DXP_AMIGA -DWITH_MOZJS -DJS_VERSION=170 -DJSVERSION_LATEST=170 -DJSOPTION_JIT=0 -DJSCLASS_GLOBAL_FLAGS=0,-ljs,JavaScript))
   $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
   $(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
 
   CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
-  CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl openssl)
   CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
 
   LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
@@ -66,23 +59,22 @@ MESSAGES_FILTER=ami
 # Source file setup
 # ----------------------------------------------------------------------------
 
-# S_AMIGA are sources purely for the Amiga build
-S_AMIGA := gui.c tree.c history.c hotlist.c schedule.c file.c		\
-	misc.c bitmap.c font.c filetype.c utf8.c login.c	\
+# sources purely for the Amiga build
+S_FRONTEND := gui.c tree.c history.c hotlist.c schedule.c file.c	\
+	misc.c bitmap.c font.c filetype.c utf8.c login.c		\
 	plotters.c object.c menu.c save_pdf.c arexx.c version.c		\
-	cookies.c ctxmenu.c clipboard.c help.c font_scan.c	\
+	cookies.c ctxmenu.c clipboard.c help.c font_scan.c		\
 	launch.c search.c history_local.c download.c iff_dr2d.c		\
 	sslcert.c gui_options.c print.c	theme.c	drag.c icon.c libs.c	\
 	datatypes.c dt_picture.c dt_anim.c dt_sound.c plugin_hack.c	\
 	stringview/stringview.c stringview/urlhistory.c rtg.c		\
 	agclass/amigaguide_class.c os3support.c font_diskfont.c		\
 	selectmenu.c hash/xxhash.c font_cache.c font_bullet.c
-S_AMIGA := $(addprefix amiga/,$(S_AMIGA))
 
 # This is the final source build list
 # Note this is deliberately *not* expanded here as common and image
 #   are not yet available
-SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA)
+SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND)
 
 # ----------------------------------------------------------------------------
 # Install target
@@ -99,8 +91,8 @@ package-amiga: netsurf.lha
 AMIGA_LANGUAGES := de en it ja nl
 AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info favicon.png LangNames mimetypes Resource.map SearchEngines splash.png
 AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle Icons
-AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES))
-AMIGA_DISTRIBUTION_FILES := amiga/dist/*
+AMIGA_RESOURCES := $(addprefix $(FRONTEND_SOURCE_DIR)/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES))
+AMIGA_DISTRIBUTION_FILES := $(FRONTEND_SOURCE_DIR)/dist/*
 AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
 
 netsurf.lha: $(EXETARGET)
diff --git a/amiga/Makefile.defaults b/frontends/amiga/Makefile.defaults
index 0674a9de2..0674a9de2 100644
--- a/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
diff --git a/amiga/agclass/amigaguide_class.c b/frontends/amiga/agclass/amigaguide_class.c
index 2b80223ca..2b80223ca 100644
--- a/amiga/agclass/amigaguide_class.c
+++ b/frontends/amiga/agclass/amigaguide_class.c
diff --git a/amiga/agclass/amigaguide_class.h b/frontends/amiga/agclass/amigaguide_class.h
index ee7e55e60..ee7e55e60 100755
--- a/amiga/agclass/amigaguide_class.h
+++ b/frontends/amiga/agclass/amigaguide_class.h
diff --git a/amiga/arexx.c b/frontends/amiga/arexx.c
index c5b5ab42d..c5b5ab42d 100644
--- a/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
diff --git a/amiga/arexx.h b/frontends/amiga/arexx.h
index 358d174f3..358d174f3 100755
--- a/amiga/arexx.h
+++ b/frontends/amiga/arexx.h
diff --git a/amiga/bitmap.c b/frontends/amiga/bitmap.c
index d04857262..d04857262 100644
--- a/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
diff --git a/amiga/bitmap.h b/frontends/amiga/bitmap.h
index d7dd70bce..d7dd70bce 100755
--- a/amiga/bitmap.h
+++ b/frontends/amiga/bitmap.h
diff --git a/amiga/clipboard.c b/frontends/amiga/clipboard.c
index 12ceb0f09..12ceb0f09 100644
--- a/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
diff --git a/amiga/clipboard.h b/frontends/amiga/clipboard.h
index bc5b779ef..bc5b779ef 100755
--- a/amiga/clipboard.h
+++ b/frontends/amiga/clipboard.h
diff --git a/amiga/cookies.c b/frontends/amiga/cookies.c
index 0ca17413e..0ca17413e 100755
--- a/amiga/cookies.c
+++ b/frontends/amiga/cookies.c
diff --git a/amiga/cookies.h b/frontends/amiga/cookies.h
index d6922750c..d6922750c 100755
--- a/amiga/cookies.h
+++ b/frontends/amiga/cookies.h
diff --git a/amiga/ctxmenu.c b/frontends/amiga/ctxmenu.c
index cc612da24..cc612da24 100644
--- a/amiga/ctxmenu.c
+++ b/frontends/amiga/ctxmenu.c
diff --git a/amiga/ctxmenu.h b/frontends/amiga/ctxmenu.h
index 08a5fe582..08a5fe582 100644
--- a/amiga/ctxmenu.h
+++ b/frontends/amiga/ctxmenu.h
diff --git a/amiga/datatypes.c b/frontends/amiga/datatypes.c
index 6018b107f..6018b107f 100644
--- a/amiga/datatypes.c
+++ b/frontends/amiga/datatypes.c
diff --git a/amiga/datatypes.h b/frontends/amiga/datatypes.h
index 00a9b4e5a..00a9b4e5a 100644
--- a/amiga/datatypes.h
+++ b/frontends/amiga/datatypes.h
diff --git a/amiga/dist/Install b/frontends/amiga/dist/Install
index e8d9d0ed7..e8d9d0ed7 100755
--- a/amiga/dist/Install
+++ b/frontends/amiga/dist/Install
diff --git a/amiga/dist/Install.info b/frontends/amiga/dist/Install.info
index 944fcc69d..944fcc69d 100644
--- a/amiga/dist/Install.info
+++ b/frontends/amiga/dist/Install.info
diff --git a/amiga/dist/NetSurf.guide b/frontends/amiga/dist/NetSurf.guide
index a1c3941df..a1c3941df 100755
--- a/amiga/dist/NetSurf.guide
+++ b/frontends/amiga/dist/NetSurf.guide
diff --git a/amiga/dist/NetSurf.guide.info b/frontends/amiga/dist/NetSurf.guide.info
index d6d529d31..d6d529d31 100644
--- a/amiga/dist/NetSurf.guide.info
+++ b/frontends/amiga/dist/NetSurf.guide.info
diff --git a/amiga/dist/Rexx.info b/frontends/amiga/dist/Rexx.info
index 908b01843..908b01843 100644
--- a/amiga/dist/Rexx.info
+++ b/frontends/amiga/dist/Rexx.info
diff --git a/amiga/dist/Rexx/CloseTabs.nsrx b/frontends/amiga/dist/Rexx/CloseTabs.nsrx
index 276ae11a3..276ae11a3 100644
--- a/amiga/dist/Rexx/CloseTabs.nsrx
+++ b/frontends/amiga/dist/Rexx/CloseTabs.nsrx
diff --git a/amiga/dist/Rexx/SMTube.nsrx b/frontends/amiga/dist/Rexx/SMTube.nsrx
index 5f1ab209a..5f1ab209a 100644
--- a/amiga/dist/Rexx/SMTube.nsrx
+++ b/frontends/amiga/dist/Rexx/SMTube.nsrx
diff --git a/amiga/dist/Rexx/ShowTitles.nsrx b/frontends/amiga/dist/Rexx/ShowTitles.nsrx
index 27de74122..27de74122 100644
--- a/amiga/dist/Rexx/ShowTitles.nsrx
+++ b/frontends/amiga/dist/Rexx/ShowTitles.nsrx
diff --git a/amiga/dist/Rexx/viewsource.nsrx b/frontends/amiga/dist/Rexx/viewsource.nsrx
index 755e7a3b6..755e7a3b6 100755
--- a/amiga/dist/Rexx/viewsource.nsrx
+++ b/frontends/amiga/dist/Rexx/viewsource.nsrx
diff --git a/amiga/download.c b/frontends/amiga/download.c
index a0bc5c47b..a0bc5c47b 100644
--- a/amiga/download.c
+++ b/frontends/amiga/download.c
diff --git a/amiga/download.h b/frontends/amiga/download.h
index 51981ede8..51981ede8 100755
--- a/amiga/download.h
+++ b/frontends/amiga/download.h
diff --git a/amiga/drag.c b/frontends/amiga/drag.c
index 67d17223e..67d17223e 100644
--- a/amiga/drag.c
+++ b/frontends/amiga/drag.c
diff --git a/amiga/drag.h b/frontends/amiga/drag.h
index 59a1a8467..59a1a8467 100644
--- a/amiga/drag.h
+++ b/frontends/amiga/drag.h
diff --git a/amiga/dt_anim.c b/frontends/amiga/dt_anim.c
index a3bfb1d66..a3bfb1d66 100644
--- a/amiga/dt_anim.c
+++ b/frontends/amiga/dt_anim.c
diff --git a/amiga/dt_picture.c b/frontends/amiga/dt_picture.c
index aa2418dca..aa2418dca 100644
--- a/amiga/dt_picture.c
+++ b/frontends/amiga/dt_picture.c
diff --git a/amiga/dt_sound.c b/frontends/amiga/dt_sound.c
index fe1b1fc43..fe1b1fc43 100644
--- a/amiga/dt_sound.c
+++ b/frontends/amiga/dt_sound.c
diff --git a/amiga/file.c b/frontends/amiga/file.c
index 8957ecfe6..8957ecfe6 100644
--- a/amiga/file.c
+++ b/frontends/amiga/file.c
diff --git a/amiga/file.h b/frontends/amiga/file.h
index 29a76c477..29a76c477 100644
--- a/amiga/file.h
+++ b/frontends/amiga/file.h
diff --git a/amiga/filetype.c b/frontends/amiga/filetype.c
index 39058b41c..39058b41c 100644
--- a/amiga/filetype.c
+++ b/frontends/amiga/filetype.c
diff --git a/amiga/filetype.h b/frontends/amiga/filetype.h
index fc27b1df2..fc27b1df2 100644
--- a/amiga/filetype.h
+++ b/frontends/amiga/filetype.h
diff --git a/amiga/font.c b/frontends/amiga/font.c
index 1c9702af2..1c9702af2 100644
--- a/amiga/font.c
+++ b/frontends/amiga/font.c
diff --git a/amiga/font.h b/frontends/amiga/font.h
index cd526057f..cd526057f 100755
--- a/amiga/font.h
+++ b/frontends/amiga/font.h
diff --git a/amiga/font_bullet.c b/frontends/amiga/font_bullet.c
index 3032b9735..3032b9735 100644
--- a/amiga/font_bullet.c
+++ b/frontends/amiga/font_bullet.c
diff --git a/amiga/font_bullet.h b/frontends/amiga/font_bullet.h
index 1ab9582db..1ab9582db 100644
--- a/amiga/font_bullet.h
+++ b/frontends/amiga/font_bullet.h
diff --git a/amiga/font_cache.c b/frontends/amiga/font_cache.c
index ea285730a..ea285730a 100644
--- a/amiga/font_cache.c
+++ b/frontends/amiga/font_cache.c
diff --git a/amiga/font_cache.h b/frontends/amiga/font_cache.h
index 7c95ba594..7c95ba594 100644
--- a/amiga/font_cache.h
+++ b/frontends/amiga/font_cache.h
diff --git a/amiga/font_diskfont.c b/frontends/amiga/font_diskfont.c
index a64674ba2..a64674ba2 100644
--- a/amiga/font_diskfont.c
+++ b/frontends/amiga/font_diskfont.c
diff --git a/amiga/font_diskfont.h b/frontends/amiga/font_diskfont.h
index de19e940e..de19e940e 100644
--- a/amiga/font_diskfont.h
+++ b/frontends/amiga/font_diskfont.h
diff --git a/amiga/font_scan.c b/frontends/amiga/font_scan.c
index b65798d6e..b65798d6e 100644
--- a/amiga/font_scan.c
+++ b/frontends/amiga/font_scan.c
diff --git a/amiga/font_scan.h b/frontends/amiga/font_scan.h
index 7d61e2daa..7d61e2daa 100755
--- a/amiga/font_scan.h
+++ b/frontends/amiga/font_scan.h
diff --git a/amiga/gui.c b/frontends/amiga/gui.c
index c6c963312..c6c963312 100644
--- a/amiga/gui.c
+++ b/frontends/amiga/gui.c
diff --git a/amiga/gui.h b/frontends/amiga/gui.h
index d301ac574..d301ac574 100644
--- a/amiga/gui.h
+++ b/frontends/amiga/gui.h
diff --git a/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 221b0da95..221b0da95 100755
--- a/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
diff --git a/amiga/gui_options.h b/frontends/amiga/gui_options.h
index 04c1be51e..04c1be51e 100755
--- a/amiga/gui_options.h
+++ b/frontends/amiga/gui_options.h
diff --git a/amiga/hash/xxhash.c b/frontends/amiga/hash/xxhash.c
index d55a36154..d55a36154 100644
--- a/amiga/hash/xxhash.c
+++ b/frontends/amiga/hash/xxhash.c
diff --git a/amiga/hash/xxhash.h b/frontends/amiga/hash/xxhash.h
index c60aa6157..c60aa6157 100644
--- a/amiga/hash/xxhash.h
+++ b/frontends/amiga/hash/xxhash.h
diff --git a/amiga/help.c b/frontends/amiga/help.c
index 64b338426..64b338426 100755
--- a/amiga/help.c
+++ b/frontends/amiga/help.c
diff --git a/amiga/help.h b/frontends/amiga/help.h
index e405edd0c..e405edd0c 100755
--- a/amiga/help.h
+++ b/frontends/amiga/help.h
diff --git a/amiga/history.c b/frontends/amiga/history.c
index 72b69d435..72b69d435 100755
--- a/amiga/history.c
+++ b/frontends/amiga/history.c
diff --git a/amiga/history.h b/frontends/amiga/history.h
index 1f064746a..1f064746a 100755
--- a/amiga/history.h
+++ b/frontends/amiga/history.h
diff --git a/amiga/history_local.c b/frontends/amiga/history_local.c
index 3016cbf16..3016cbf16 100755
--- a/amiga/history_local.c
+++ b/frontends/amiga/history_local.c
diff --git a/amiga/history_local.h b/frontends/amiga/history_local.h
index 452fe1512..452fe1512 100755
--- a/amiga/history_local.h
+++ b/frontends/amiga/history_local.h
diff --git a/amiga/hotlist.c b/frontends/amiga/hotlist.c
index 79e679f77..79e679f77 100755
--- a/amiga/hotlist.c
+++ b/frontends/amiga/hotlist.c
diff --git a/amiga/hotlist.h b/frontends/amiga/hotlist.h
index c50ceecfb..c50ceecfb 100755
--- a/amiga/hotlist.h
+++ b/frontends/amiga/hotlist.h
diff --git a/amiga/icon.c b/frontends/amiga/icon.c
index e75bf82b0..e75bf82b0 100644
--- a/amiga/icon.c
+++ b/frontends/amiga/icon.c
diff --git a/amiga/icon.h b/frontends/amiga/icon.h
index e0ea5b734..e0ea5b734 100644
--- a/amiga/icon.h
+++ b/frontends/amiga/icon.h
diff --git a/amiga/iff_cset.h b/frontends/amiga/iff_cset.h
index 2b8af8f6e..2b8af8f6e 100755
--- a/amiga/iff_cset.h
+++ b/frontends/amiga/iff_cset.h
diff --git a/amiga/iff_dr2d.c b/frontends/amiga/iff_dr2d.c
index a4d17386b..a4d17386b 100644
--- a/amiga/iff_dr2d.c
+++ b/frontends/amiga/iff_dr2d.c
diff --git a/amiga/iff_dr2d.h b/frontends/amiga/iff_dr2d.h
index c9981d33a..c9981d33a 100644
--- a/amiga/iff_dr2d.h
+++ b/frontends/amiga/iff_dr2d.h
diff --git a/amiga/launch.c b/frontends/amiga/launch.c
index 1f2b9e16c..1f2b9e16c 100755
--- a/amiga/launch.c
+++ b/frontends/amiga/launch.c
diff --git a/amiga/launch.h b/frontends/amiga/launch.h
index e2b355065..e2b355065 100755
--- a/amiga/launch.h
+++ b/frontends/amiga/launch.h
diff --git a/amiga/libs.c b/frontends/amiga/libs.c
index 993cd3ad0..993cd3ad0 100644
--- a/amiga/libs.c
+++ b/frontends/amiga/libs.c
diff --git a/amiga/libs.h b/frontends/amiga/libs.h
index aa3622af2..aa3622af2 100644
--- a/amiga/libs.h
+++ b/frontends/amiga/libs.h
diff --git a/amiga/login.c b/frontends/amiga/login.c
index a4c0d62bb..a4c0d62bb 100755
--- a/amiga/login.c
+++ b/frontends/amiga/login.c
diff --git a/amiga/login.h b/frontends/amiga/login.h
index e3f77901f..e3f77901f 100755
--- a/amiga/login.h
+++ b/frontends/amiga/login.h
diff --git a/amiga/menu.c b/frontends/amiga/menu.c
index 4a30c4878..4a30c4878 100644
--- a/amiga/menu.c
+++ b/frontends/amiga/menu.c
diff --git a/amiga/menu.h b/frontends/amiga/menu.h
index 3bec113d0..3bec113d0 100755
--- a/amiga/menu.h
+++ b/frontends/amiga/menu.h
diff --git a/amiga/misc.c b/frontends/amiga/misc.c
index 2c233584d..2c233584d 100755
--- a/amiga/misc.c
+++ b/frontends/amiga/misc.c
diff --git a/amiga/misc.h b/frontends/amiga/misc.h
index c7ae5af78..c7ae5af78 100644
--- a/amiga/misc.h
+++ b/frontends/amiga/misc.h
diff --git a/amiga/object.c b/frontends/amiga/object.c
index 8da16394e..8da16394e 100755
--- a/amiga/object.c
+++ b/frontends/amiga/object.c
diff --git a/amiga/object.h b/frontends/amiga/object.h
index be9650413..be9650413 100755
--- a/amiga/object.h
+++ b/frontends/amiga/object.h
diff --git a/amiga/options.h b/frontends/amiga/options.h
index 0c4db5c45..0c4db5c45 100644
--- a/amiga/options.h
+++ b/frontends/amiga/options.h
diff --git a/amiga/os3support.c b/frontends/amiga/os3support.c
index b251448a6..b251448a6 100644
--- a/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
diff --git a/amiga/os3support.h b/frontends/amiga/os3support.h
index 94d1d5818..94d1d5818 100644
--- a/amiga/os3support.h
+++ b/frontends/amiga/os3support.h
diff --git a/amiga/pkg/AutoInstall b/frontends/amiga/pkg/AutoInstall
index 6785a5dff..6785a5dff 100755
--- a/amiga/pkg/AutoInstall
+++ b/frontends/amiga/pkg/AutoInstall
diff --git a/amiga/pkg/drawer.info b/frontends/amiga/pkg/drawer.info
index 0a9548a0d..0a9548a0d 100644
--- a/amiga/pkg/drawer.info
+++ b/frontends/amiga/pkg/drawer.info
diff --git a/amiga/pkg/makepackage b/frontends/amiga/pkg/makepackage
index 4f5eb84d8..4f5eb84d8 100755
--- a/amiga/pkg/makepackage
+++ b/frontends/amiga/pkg/makepackage
diff --git a/amiga/pkg/makereslinks b/frontends/amiga/pkg/makereslinks
index 4302dbd23..4302dbd23 100755
--- a/amiga/pkg/makereslinks
+++ b/frontends/amiga/pkg/makereslinks
diff --git a/amiga/pkg/netsurf.readme b/frontends/amiga/pkg/netsurf.readme
index 3e929b040..3e929b040 100755
--- a/amiga/pkg/netsurf.readme
+++ b/frontends/amiga/pkg/netsurf.readme
diff --git a/amiga/pkg/netsurf.readme.info b/frontends/amiga/pkg/netsurf.readme.info
index c0ee5ff44..c0ee5ff44 100644
--- a/amiga/pkg/netsurf.readme.info
+++ b/frontends/amiga/pkg/netsurf.readme.info
diff --git a/amiga/pkg/netsurf_os3.readme b/frontends/amiga/pkg/netsurf_os3.readme
index d9c0eb58a..d9c0eb58a 100644
--- a/amiga/pkg/netsurf_os3.readme
+++ b/frontends/amiga/pkg/netsurf_os3.readme
diff --git a/amiga/pkg/netsurf_os3.readme.info b/frontends/amiga/pkg/netsurf_os3.readme.info
index c0ee5ff44..c0ee5ff44 100644
--- a/amiga/pkg/netsurf_os3.readme.info
+++ b/frontends/amiga/pkg/netsurf_os3.readme.info
diff --git a/amiga/plotters.c b/frontends/amiga/plotters.c
index 23a73f84a..23a73f84a 100644
--- a/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
diff --git a/amiga/plotters.h b/frontends/amiga/plotters.h
index 7baa21fb5..7baa21fb5 100644
--- a/amiga/plotters.h
+++ b/frontends/amiga/plotters.h
diff --git a/amiga/plugin_hack.c b/frontends/amiga/plugin_hack.c
index 21f4da142..21f4da142 100644
--- a/amiga/plugin_hack.c
+++ b/frontends/amiga/plugin_hack.c
diff --git a/amiga/plugin_hack.h b/frontends/amiga/plugin_hack.h
index 3d644ae8b..3d644ae8b 100644
--- a/amiga/plugin_hack.h
+++ b/frontends/amiga/plugin_hack.h
diff --git a/amiga/print.c b/frontends/amiga/print.c
index fcccc91e2..fcccc91e2 100644
--- a/amiga/print.c
+++ b/frontends/amiga/print.c
diff --git a/amiga/print.h b/frontends/amiga/print.h
index bdd409b50..bdd409b50 100755
--- a/amiga/print.h
+++ b/frontends/amiga/print.h
diff --git a/amiga/resources/AdBlock.css b/frontends/amiga/resources/AdBlock.css
index e3811f62b..e3811f62b 120000
--- a/amiga/resources/AdBlock.css
+++ b/frontends/amiga/resources/AdBlock.css
diff --git a/amiga/resources/LangNames b/frontends/amiga/resources/LangNames
index 6dc145bfc..6dc145bfc 100644
--- a/amiga/resources/LangNames
+++ b/frontends/amiga/resources/LangNames
diff --git a/amiga/resources/Pointers/Blank b/frontends/amiga/resources/Pointers/Blank
index 419fb503a..419fb503a 100755
--- a/amiga/resources/Pointers/Blank
+++ b/frontends/amiga/resources/Pointers/Blank
diff --git a/amiga/resources/Pointers/Blank.info b/frontends/amiga/resources/Pointers/Blank.info
index 5ce812b26..5ce812b26 100644
--- a/amiga/resources/Pointers/Blank.info
+++ b/frontends/amiga/resources/Pointers/Blank.info
diff --git a/amiga/resources/Pointers/Caret b/frontends/amiga/resources/Pointers/Caret
index 3b1604e85..3b1604e85 100755
--- a/amiga/resources/Pointers/Caret
+++ b/frontends/amiga/resources/Pointers/Caret
diff --git a/amiga/resources/Pointers/Caret.info b/frontends/amiga/resources/Pointers/Caret.info
index 11d9c5fc9..11d9c5fc9 100644
--- a/amiga/resources/Pointers/Caret.info
+++ b/frontends/amiga/resources/Pointers/Caret.info
diff --git a/amiga/resources/Pointers/Cross.info b/frontends/amiga/resources/Pointers/Cross.info
index 7aa433139..7aa433139 100644
--- a/amiga/resources/Pointers/Cross.info
+++ b/frontends/amiga/resources/Pointers/Cross.info
diff --git a/amiga/resources/Pointers/Default b/frontends/amiga/resources/Pointers/Default
index 8f88f3d33..8f88f3d33 100755
--- a/amiga/resources/Pointers/Default
+++ b/frontends/amiga/resources/Pointers/Default
diff --git a/amiga/resources/Pointers/Default.info b/frontends/amiga/resources/Pointers/Default.info
index dc8c2b0ed..dc8c2b0ed 100644
--- a/amiga/resources/Pointers/Default.info
+++ b/frontends/amiga/resources/Pointers/Default.info
diff --git a/amiga/resources/Pointers/Down.info b/frontends/amiga/resources/Pointers/Down.info
index e4667bca1..e4667bca1 100644
--- a/amiga/resources/Pointers/Down.info
+++ b/frontends/amiga/resources/Pointers/Down.info
diff --git a/amiga/resources/Pointers/Drag.info b/frontends/amiga/resources/Pointers/Drag.info
index 820d75373..820d75373 100644
--- a/amiga/resources/Pointers/Drag.info
+++ b/frontends/amiga/resources/Pointers/Drag.info
diff --git a/amiga/resources/Pointers/Help.info b/frontends/amiga/resources/Pointers/Help.info
index ca5947105..ca5947105 100644
--- a/amiga/resources/Pointers/Help.info
+++ b/frontends/amiga/resources/Pointers/Help.info
diff --git a/amiga/resources/Pointers/Left.info b/frontends/amiga/resources/Pointers/Left.info
index 1a3b4e835..1a3b4e835 100644
--- a/amiga/resources/Pointers/Left.info
+++ b/frontends/amiga/resources/Pointers/Left.info
diff --git a/amiga/resources/Pointers/LeftDown.info b/frontends/amiga/resources/Pointers/LeftDown.info
index e8f39cb24..e8f39cb24 100644
--- a/amiga/resources/Pointers/LeftDown.info
+++ b/frontends/amiga/resources/Pointers/LeftDown.info
diff --git a/amiga/resources/Pointers/LeftUp.info b/frontends/amiga/resources/Pointers/LeftUp.info
index be80018f3..be80018f3 100644
--- a/amiga/resources/Pointers/LeftUp.info
+++ b/frontends/amiga/resources/Pointers/LeftUp.info
diff --git a/amiga/resources/Pointers/Menu b/frontends/amiga/resources/Pointers/Menu
index 29442146c..29442146c 100755
--- a/amiga/resources/Pointers/Menu
+++ b/frontends/amiga/resources/Pointers/Menu
diff --git a/amiga/resources/Pointers/Menu.info b/frontends/amiga/resources/Pointers/Menu.info
index 2a1143f11..2a1143f11 100644
--- a/amiga/resources/Pointers/Menu.info
+++ b/frontends/amiga/resources/Pointers/Menu.info
diff --git a/amiga/resources/Pointers/Move b/frontends/amiga/resources/Pointers/Move
index 16d88e869..16d88e869 100755
--- a/amiga/resources/Pointers/Move
+++ b/frontends/amiga/resources/Pointers/Move
diff --git a/amiga/resources/Pointers/Move.info b/frontends/amiga/resources/Pointers/Move.info
index 606f5d283..606f5d283 100644
--- a/amiga/resources/Pointers/Move.info
+++ b/frontends/amiga/resources/Pointers/Move.info
diff --git a/amiga/resources/Pointers/NoDrop.info b/frontends/amiga/resources/Pointers/NoDrop.info
index 22e77a4be..22e77a4be 100644
--- a/amiga/resources/Pointers/NoDrop.info
+++ b/frontends/amiga/resources/Pointers/NoDrop.info
diff --git a/amiga/resources/Pointers/NotAllowed.info b/frontends/amiga/resources/Pointers/NotAllowed.info
index 01545bbba..01545bbba 100644
--- a/amiga/resources/Pointers/NotAllowed.info
+++ b/frontends/amiga/resources/Pointers/NotAllowed.info
diff --git a/amiga/resources/Pointers/Point b/frontends/amiga/resources/Pointers/Point
index 25e92be77..25e92be77 100755
--- a/amiga/resources/Pointers/Point
+++ b/frontends/amiga/resources/Pointers/Point
diff --git a/amiga/resources/Pointers/Point.info b/frontends/amiga/resources/Pointers/Point.info
index 685e4f5e0..685e4f5e0 100644
--- a/amiga/resources/Pointers/Point.info
+++ b/frontends/amiga/resources/Pointers/Point.info
diff --git a/amiga/resources/Pointers/Progress.info b/frontends/amiga/resources/Pointers/Progress.info
index c47d52e99..c47d52e99 100644
--- a/amiga/resources/Pointers/Progress.info
+++ b/frontends/amiga/resources/Pointers/Progress.info
diff --git a/amiga/resources/Pointers/Right.info b/frontends/amiga/resources/Pointers/Right.info
index 7080c4e77..7080c4e77 100644
--- a/amiga/resources/Pointers/Right.info
+++ b/frontends/amiga/resources/Pointers/Right.info
diff --git a/amiga/resources/Pointers/RightDown.info b/frontends/amiga/resources/Pointers/RightDown.info
index 0f5c181cf..0f5c181cf 100644
--- a/amiga/resources/Pointers/RightDown.info
+++ b/frontends/amiga/resources/Pointers/RightDown.info
diff --git a/amiga/resources/Pointers/RightUp.info b/frontends/amiga/resources/Pointers/RightUp.info
index 140ef15c5..140ef15c5 100644
--- a/amiga/resources/Pointers/RightUp.info
+++ b/frontends/amiga/resources/Pointers/RightUp.info
diff --git a/amiga/resources/Pointers/Up.info b/frontends/amiga/resources/Pointers/Up.info
index f4b44421f..f4b44421f 100644
--- a/amiga/resources/Pointers/Up.info
+++ b/frontends/amiga/resources/Pointers/Up.info
diff --git a/amiga/resources/Pointers/Wait b/frontends/amiga/resources/Pointers/Wait
index 6d9421279..6d9421279 100755
--- a/amiga/resources/Pointers/Wait
+++ b/frontends/amiga/resources/Pointers/Wait
diff --git a/amiga/resources/Pointers/Wait.info b/frontends/amiga/resources/Pointers/Wait.info
index 88aa27a03..88aa27a03 100644
--- a/amiga/resources/Pointers/Wait.info
+++ b/frontends/amiga/resources/Pointers/Wait.info
diff --git a/amiga/resources/Resource.map b/frontends/amiga/resources/Resource.map
index dbe02a4bc..dbe02a4bc 100644
--- a/amiga/resources/Resource.map
+++ b/frontends/amiga/resources/Resource.map
diff --git a/amiga/resources/SearchEngines b/frontends/amiga/resources/SearchEngines
index f1b705a0a..f1b705a0a 100644
--- a/amiga/resources/SearchEngines
+++ b/frontends/amiga/resources/SearchEngines
diff --git a/amiga/resources/Themes/AISS/NetSurf.info b/frontends/amiga/resources/Themes/AISS/NetSurf.info
index 70275756e..70275756e 100644
--- a/amiga/resources/Themes/AISS/NetSurf.info
+++ b/frontends/amiga/resources/Themes/AISS/NetSurf.info
diff --git a/amiga/resources/Themes/AISS/Resource.map b/frontends/amiga/resources/Themes/AISS/Resource.map
index 4fe374aa2..4fe374aa2 100644
--- a/amiga/resources/Themes/AISS/Resource.map
+++ b/frontends/amiga/resources/Themes/AISS/Resource.map
diff --git a/amiga/resources/Themes/AISS/Theme b/frontends/amiga/resources/Themes/AISS/Theme
index 8c5af103c..8c5af103c 100755
--- a/amiga/resources/Themes/AISS/Theme
+++ b/frontends/amiga/resources/Themes/AISS/Theme
diff --git a/amiga/resources/Themes/AISS/Throbber b/frontends/amiga/resources/Themes/AISS/Throbber
index a8c38d153..a8c38d153 100644
--- a/amiga/resources/Themes/AISS/Throbber
+++ b/frontends/amiga/resources/Themes/AISS/Throbber
diff --git a/amiga/resources/Themes/Default/NetSurf.info b/frontends/amiga/resources/Themes/Default/NetSurf.info
index 0e6017253..0e6017253 100644
--- a/amiga/resources/Themes/Default/NetSurf.info
+++ b/frontends/amiga/resources/Themes/Default/NetSurf.info
diff --git a/amiga/resources/Themes/Default/Theme b/frontends/amiga/resources/Themes/Default/Theme
index 141e84f54..141e84f54 100755
--- a/amiga/resources/Themes/Default/Theme
+++ b/frontends/amiga/resources/Themes/Default/Theme
diff --git a/amiga/resources/Themes/Default/Throbber b/frontends/amiga/resources/Themes/Default/Throbber
index 7dd714248..7dd714248 100644
--- a/amiga/resources/Themes/Default/Throbber
+++ b/frontends/amiga/resources/Themes/Default/Throbber
diff --git a/amiga/resources/Themes/Default/back.png b/frontends/amiga/resources/Themes/Default/back.png
index f219fd807..f219fd807 100755
--- a/amiga/resources/Themes/Default/back.png
+++ b/frontends/amiga/resources/Themes/Default/back.png
diff --git a/amiga/resources/Themes/Default/back_g.png b/frontends/amiga/resources/Themes/Default/back_g.png
index 0796bbbbf..0796bbbbf 100644
--- a/amiga/resources/Themes/Default/back_g.png
+++ b/frontends/amiga/resources/Themes/Default/back_g.png
diff --git a/amiga/resources/Themes/Default/back_h.png b/frontends/amiga/resources/Themes/Default/back_h.png
index 35e31386a..35e31386a 100644
--- a/amiga/resources/Themes/Default/back_h.png
+++ b/frontends/amiga/resources/Themes/Default/back_h.png
diff --git a/amiga/resources/Themes/Default/closetab.png b/frontends/amiga/resources/Themes/Default/closetab.png
index 21d97f11d..21d97f11d 100644
--- a/amiga/resources/Themes/Default/closetab.png
+++ b/frontends/amiga/resources/Themes/Default/closetab.png
diff --git a/amiga/resources/Themes/Default/closetab_g.png b/frontends/amiga/resources/Themes/Default/closetab_g.png
index a50fa0f45..a50fa0f45 100644
--- a/amiga/resources/Themes/Default/closetab_g.png
+++ b/frontends/amiga/resources/Themes/Default/closetab_g.png
diff --git a/amiga/resources/Themes/Default/forward.png b/frontends/amiga/resources/Themes/Default/forward.png
index f20c0cdf5..f20c0cdf5 100755
--- a/amiga/resources/Themes/Default/forward.png
+++ b/frontends/amiga/resources/Themes/Default/forward.png
diff --git a/amiga/resources/Themes/Default/forward_g.png b/frontends/amiga/resources/Themes/Default/forward_g.png
index d847543f3..d847543f3 100644
--- a/amiga/resources/Themes/Default/forward_g.png
+++ b/frontends/amiga/resources/Themes/Default/forward_g.png
diff --git a/amiga/resources/Themes/Default/forward_h.png b/frontends/amiga/resources/Themes/Default/forward_h.png
index 90c0fe2c7..90c0fe2c7 100644
--- a/amiga/resources/Themes/Default/forward_h.png
+++ b/frontends/amiga/resources/Themes/Default/forward_h.png
diff --git a/amiga/resources/Themes/Default/home.png b/frontends/amiga/resources/Themes/Default/home.png
index 604796025..604796025 100755
--- a/amiga/resources/Themes/Default/home.png
+++ b/frontends/amiga/resources/Themes/Default/home.png
diff --git a/amiga/resources/Themes/Default/home_g.png b/frontends/amiga/resources/Themes/Default/home_g.png
index a644b0b03..a644b0b03 100644
--- a/amiga/resources/Themes/Default/home_g.png
+++ b/frontends/amiga/resources/Themes/Default/home_g.png
diff --git a/amiga/resources/Themes/Default/home_h.png b/frontends/amiga/resources/Themes/Default/home_h.png
index 2d6be5f34..2d6be5f34 100644
--- a/amiga/resources/Themes/Default/home_h.png
+++ b/frontends/amiga/resources/Themes/Default/home_h.png
diff --git a/amiga/resources/Themes/Default/reload.png b/frontends/amiga/resources/Themes/Default/reload.png
index a81f650b0..a81f650b0 100755
--- a/amiga/resources/Themes/Default/reload.png
+++ b/frontends/amiga/resources/Themes/Default/reload.png
diff --git a/amiga/resources/Themes/Default/reload_g.png b/frontends/amiga/resources/Themes/Default/reload_g.png
index 5251f206c..5251f206c 100644
--- a/amiga/resources/Themes/Default/reload_g.png
+++ b/frontends/amiga/resources/Themes/Default/reload_g.png
diff --git a/amiga/resources/Themes/Default/reload_h.png b/frontends/amiga/resources/Themes/Default/reload_h.png
index 76e554e49..76e554e49 100644
--- a/amiga/resources/Themes/Default/reload_h.png
+++ b/frontends/amiga/resources/Themes/Default/reload_h.png
diff --git a/amiga/resources/Themes/Default/search.png b/frontends/amiga/resources/Themes/Default/search.png
index a59c12b8f..a59c12b8f 100644
--- a/amiga/resources/Themes/Default/search.png
+++ b/frontends/amiga/resources/Themes/Default/search.png
diff --git a/amiga/resources/Themes/Default/stop.png b/frontends/amiga/resources/Themes/Default/stop.png
index df64c5747..df64c5747 100755
--- a/amiga/resources/Themes/Default/stop.png
+++ b/frontends/amiga/resources/Themes/Default/stop.png
diff --git a/amiga/resources/Themes/Default/stop_g.png b/frontends/amiga/resources/Themes/Default/stop_g.png
index a2efa9e3d..a2efa9e3d 100644
--- a/amiga/resources/Themes/Default/stop_g.png
+++ b/frontends/amiga/resources/Themes/Default/stop_g.png
diff --git a/amiga/resources/Themes/Default/stop_h.png b/frontends/amiga/resources/Themes/Default/stop_h.png
index 3c3377cdf..3c3377cdf 100644
--- a/amiga/resources/Themes/Default/stop_h.png
+++ b/frontends/amiga/resources/Themes/Default/stop_h.png
diff --git a/amiga/resources/blankspace.png b/frontends/amiga/resources/blankspace.png
index 1f1e672d0..1f1e672d0 100644
--- a/amiga/resources/blankspace.png
+++ b/frontends/amiga/resources/blankspace.png
diff --git a/amiga/resources/ca-bundle b/frontends/amiga/resources/ca-bundle
index ad2dd6b55..ad2dd6b55 120000
--- a/amiga/resources/ca-bundle
+++ b/frontends/amiga/resources/ca-bundle
diff --git a/amiga/resources/de b/frontends/amiga/resources/de
index 38128816c..38128816c 120000
--- a/amiga/resources/de
+++ b/frontends/amiga/resources/de
diff --git a/amiga/resources/default.css b/frontends/amiga/resources/default.css
index 7101e191f..7101e191f 100644
--- a/amiga/resources/default.css
+++ b/frontends/amiga/resources/default.css
diff --git a/amiga/resources/default.css.info b/frontends/amiga/resources/default.css.info
index 0f7ab4b66..0f7ab4b66 100644
--- a/amiga/resources/default.css.info
+++ b/frontends/amiga/resources/default.css.info
diff --git a/amiga/resources/en b/frontends/amiga/resources/en
index d1dfaa9d2..d1dfaa9d2 120000
--- a/amiga/resources/en
+++ b/frontends/amiga/resources/en
diff --git a/amiga/resources/favicon.png b/frontends/amiga/resources/favicon.png
index 53234c38c..53234c38c 100644
--- a/amiga/resources/favicon.png
+++ b/frontends/amiga/resources/favicon.png
diff --git a/amiga/resources/fr b/frontends/amiga/resources/fr
index df1cbe3a1..df1cbe3a1 120000
--- a/amiga/resources/fr
+++ b/frontends/amiga/resources/fr
diff --git a/amiga/resources/it b/frontends/amiga/resources/it
index 6177e9176..6177e9176 120000
--- a/amiga/resources/it
+++ b/frontends/amiga/resources/it
diff --git a/amiga/resources/mimetypes b/frontends/amiga/resources/mimetypes
index 822e12b82..822e12b82 100644
--- a/amiga/resources/mimetypes
+++ b/frontends/amiga/resources/mimetypes
diff --git a/amiga/resources/nl b/frontends/amiga/resources/nl
index a07bd0469..a07bd0469 120000
--- a/amiga/resources/nl
+++ b/frontends/amiga/resources/nl
diff --git a/amiga/resources/nsdefault.css b/frontends/amiga/resources/nsdefault.css
index 6d2d4da5b..6d2d4da5b 120000
--- a/amiga/resources/nsdefault.css
+++ b/frontends/amiga/resources/nsdefault.css
diff --git a/amiga/resources/quirks.css b/frontends/amiga/resources/quirks.css
index d9fb80334..d9fb80334 120000
--- a/amiga/resources/quirks.css
+++ b/frontends/amiga/resources/quirks.css
diff --git a/amiga/resources/splash.png b/frontends/amiga/resources/splash.png
index 569cb08fa..569cb08fa 100644
--- a/amiga/resources/splash.png
+++ b/frontends/amiga/resources/splash.png
diff --git a/amiga/rtg.c b/frontends/amiga/rtg.c
index 5e1cac290..5e1cac290 100644
--- a/amiga/rtg.c
+++ b/frontends/amiga/rtg.c
diff --git a/amiga/rtg.h b/frontends/amiga/rtg.h
index 72f5bf38b..72f5bf38b 100644
--- a/amiga/rtg.h
+++ b/frontends/amiga/rtg.h
diff --git a/amiga/save_pdf.c b/frontends/amiga/save_pdf.c
index b70fc5716..b70fc5716 100644
--- a/amiga/save_pdf.c
+++ b/frontends/amiga/save_pdf.c
diff --git a/amiga/save_pdf.h b/frontends/amiga/save_pdf.h
index 4a5a7edde..4a5a7edde 100644
--- a/amiga/save_pdf.h
+++ b/frontends/amiga/save_pdf.h
diff --git a/amiga/schedule.c b/frontends/amiga/schedule.c
index e34c00017..e34c00017 100755
--- a/amiga/schedule.c
+++ b/frontends/amiga/schedule.c
diff --git a/amiga/schedule.h b/frontends/amiga/schedule.h
index fb648eaa4..fb648eaa4 100755
--- a/amiga/schedule.h
+++ b/frontends/amiga/schedule.h
diff --git a/amiga/search.c b/frontends/amiga/search.c
index 5ca979220..5ca979220 100755
--- a/amiga/search.c
+++ b/frontends/amiga/search.c
diff --git a/amiga/search.h b/frontends/amiga/search.h
index c4f30eb01..c4f30eb01 100755
--- a/amiga/search.h
+++ b/frontends/amiga/search.h
diff --git a/amiga/selectmenu.c b/frontends/amiga/selectmenu.c
index 25931783f..25931783f 100644
--- a/amiga/selectmenu.c
+++ b/frontends/amiga/selectmenu.c
diff --git a/amiga/selectmenu.h b/frontends/amiga/selectmenu.h
index f55b6ca98..f55b6ca98 100755
--- a/amiga/selectmenu.h
+++ b/frontends/amiga/selectmenu.h
diff --git a/amiga/sslcert.c b/frontends/amiga/sslcert.c
index 699ce71b8..699ce71b8 100644
--- a/amiga/sslcert.c
+++ b/frontends/amiga/sslcert.c
diff --git a/amiga/sslcert.h b/frontends/amiga/sslcert.h
index 953142e98..953142e98 100644
--- a/amiga/sslcert.h
+++ b/frontends/amiga/sslcert.h
diff --git a/amiga/stringview/stringview.c b/frontends/amiga/stringview/stringview.c
index e875f3b5a..e875f3b5a 100755
--- a/amiga/stringview/stringview.c
+++ b/frontends/amiga/stringview/stringview.c
diff --git a/amiga/stringview/stringview.h b/frontends/amiga/stringview/stringview.h
index f989b2a0f..f989b2a0f 100755
--- a/amiga/stringview/stringview.h
+++ b/frontends/amiga/stringview/stringview.h
diff --git a/amiga/stringview/urlhistory.c b/frontends/amiga/stringview/urlhistory.c
index c58a3770b..c58a3770b 100644
--- a/amiga/stringview/urlhistory.c
+++ b/frontends/amiga/stringview/urlhistory.c
diff --git a/amiga/stringview/urlhistory.h b/frontends/amiga/stringview/urlhistory.h
index b72792db4..b72792db4 100644
--- a/amiga/stringview/urlhistory.h
+++ b/frontends/amiga/stringview/urlhistory.h
diff --git a/amiga/theme.c b/frontends/amiga/theme.c
index ab32b23dd..ab32b23dd 100644
--- a/amiga/theme.c
+++ b/frontends/amiga/theme.c
diff --git a/amiga/theme.h b/frontends/amiga/theme.h
index f295efee1..f295efee1 100644
--- a/amiga/theme.h
+++ b/frontends/amiga/theme.h
diff --git a/amiga/tree.c b/frontends/amiga/tree.c
index f147b5e5c..f147b5e5c 100644
--- a/amiga/tree.c
+++ b/frontends/amiga/tree.c
diff --git a/amiga/tree.h b/frontends/amiga/tree.h
index 39a71d70d..39a71d70d 100755
--- a/amiga/tree.h
+++ b/frontends/amiga/tree.h
diff --git a/amiga/utf8.c b/frontends/amiga/utf8.c
index 91d7c90c0..91d7c90c0 100755
--- a/amiga/utf8.c
+++ b/frontends/amiga/utf8.c
diff --git a/amiga/utf8.h b/frontends/amiga/utf8.h
index 065a149f2..065a149f2 100755
--- a/amiga/utf8.h
+++ b/frontends/amiga/utf8.h
diff --git a/amiga/version.c b/frontends/amiga/version.c
index bc31d0c96..bc31d0c96 100644
--- a/amiga/version.c
+++ b/frontends/amiga/version.c
diff --git a/atari/Makefile.target b/frontends/atari/Makefile
index 34be8a915..60b7f879c 100644
--- a/atari/Makefile.target
+++ b/frontends/atari/Makefile
@@ -34,30 +34,14 @@ endif
 # non-pkgconfig components
 
 FREETYPE_FONT_CFLAGS := $(shell $(FT2CF) --cflags) -DWITH_FREETYPE_FONT_DRIVER
-SPIDERMONKEY_CFLAGS := -DWITH_MOZJS -DXP_UNIX -DJS_HAS_FILE_OBJECT=0 -DJSOPTION_JIT=0 -DPOSIX_SOURCE -D_BSD_SOURCE
+SPIDERMONKEY_CFLAGS := -DXP_UNIX -DJS_HAS_FILE_OBJECT=0 -DJSOPTION_JIT=0 -DPOSIX_SOURCE -D_BSD_SOURCE
 
-$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng)))
-$(eval $(call feature_enabled,MOZJS,$(SPIDERMONKEY_CFLAGS),-ljs,JavaScript (Spidermonkey)))
 $(eval $(call feature_enabled,ATARI_FREETYPE_FONT,$(FREETYPE_FONT_CFLAGS),-lfreetype,(Freetype)))
 $(eval $(call feature_enabled,ATARI_NETSURF_FONT,-DWITH_INTERNAL_FONT_DRIVER,,(Internal Font)))
 $(eval $(call feature_enabled,ATARI_VDI_FONT,-DWITH_VDI_FONT_DRIVER,,(VDI Font)))
 $(eval $(call feature_enabled,ATARI_8BPP_SUPPORT,-DWITH_8BPP_SUPPORT,,(Indexed screen format support)))
 
-# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
-NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG
-NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB
-NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
-NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
-NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
-NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
-
-ifeq ($(NETSURF_USE_MOZJS),YES)
-NETSURF_USE_JS:=YES
-NETSURF_USE_MOZJS:=YES
-endif
-
-$(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,libcares,Cares))
 
 CFLAGS += -U__STRICT_ANSI__ -std=c99 -Dsmall -Dnsatari \
 		-D_BSD_SOURCE \
@@ -68,12 +52,12 @@ CFLAGS += -U__STRICT_ANSI__ -std=c99 -Dsmall -Dnsatari \
 
 LDFLAGS += -lcflib -lcurl
 LDFLAGS += -lssl -lcrypto
-LDFLAGS += -lz -lcares -lHermes -lgem -lm
+LDFLAGS += -lz -lHermes -lgem -lm
 LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
 
 
-# S_ATARI are sources purely for the Atari FreeMiNT build
-S_ATARI := \
+# sources purely for the Atari FreeMiNT build
+S_FRONTEND := \
 	about.c \
 	bitmap.c \
 	clipboard.c \
@@ -115,12 +99,10 @@ S_ATARI := \
 	gemtk/objc.c
 
 
-S_ATARI := $(addprefix atari/,$(S_ATARI))
-
 # This is the final source build list
 # Note this is deliberately *not* expanded here as common and image
 #   are not yet available
-SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_ATARI)
+SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND)
 EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
 
 # ----------------------------------------------------------------------------
@@ -128,8 +110,8 @@ EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
 # ----------------------------------------------------------------------------
 
 ATARI_TARGET_DIR := netsurf/
-ATARI_RES_DIR := atari/res/
-ATARI_DOC_DIR := atari/doc/
+ATARI_RES_DIR := $(FRONTEND_RESOURCES_DIR)/
+ATARI_DOC_DIR := $(FRONTEND_SOURCE_DIR)/doc/
 ATARI_FONT_NAME := ttf-bitstream-vera-1.10
 ATARI_FONT_SOURCE_URL := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/$(ATARI_FONT_NAME).tar.gz
 #ATARI_FONT_SOURCE_URL := http://localhost/$(ATARI_FONT_NAME).tar.gz
diff --git a/atari/Makefile.defaults b/frontends/atari/Makefile.defaults
index b738b48a2..b738b48a2 100644
--- a/atari/Makefile.defaults
+++ b/frontends/atari/Makefile.defaults
diff --git a/atari/about.c b/frontends/atari/about.c
index 105037aab..105037aab 100644
--- a/atari/about.c
+++ b/frontends/atari/about.c
diff --git a/atari/about.h b/frontends/atari/about.h
index dff6eaeee..dff6eaeee 100644
--- a/atari/about.h
+++ b/frontends/atari/about.h
diff --git a/atari/bitmap.c b/frontends/atari/bitmap.c
index a159a6659..a159a6659 100644
--- a/atari/bitmap.c
+++ b/frontends/atari/bitmap.c
diff --git a/atari/bitmap.h b/frontends/atari/bitmap.h
index b0fa18069..b0fa18069 100644
--- a/atari/bitmap.h
+++ b/frontends/atari/bitmap.h
diff --git a/atari/certview.c b/frontends/atari/certview.c
index 7f0a29528..7f0a29528 100644
--- a/atari/certview.c
+++ b/frontends/atari/certview.c
diff --git a/atari/certview.h b/frontends/atari/certview.h
index ff15d8076..ff15d8076 100644
--- a/atari/certview.h
+++ b/frontends/atari/certview.h
diff --git a/atari/clipboard.c b/frontends/atari/clipboard.c
index 3464e4bca..3464e4bca 100644
--- a/atari/clipboard.c
+++ b/frontends/atari/clipboard.c
diff --git a/atari/clipboard.h b/frontends/atari/clipboard.h
index aeecc9a5f..aeecc9a5f 100644
--- a/atari/clipboard.h
+++ b/frontends/atari/clipboard.h
diff --git a/atari/cookies.c b/frontends/atari/cookies.c
index 6019b4730..6019b4730 100644
--- a/atari/cookies.c
+++ b/frontends/atari/cookies.c
diff --git a/atari/cookies.h b/frontends/atari/cookies.h
index 3649c8c60..3649c8c60 100644
--- a/atari/cookies.h
+++ b/frontends/atari/cookies.h
diff --git a/atari/ctxmenu.c b/frontends/atari/ctxmenu.c
index 0343b20c7..0343b20c7 100644
--- a/atari/ctxmenu.c
+++ b/frontends/atari/ctxmenu.c
diff --git a/atari/ctxmenu.h b/frontends/atari/ctxmenu.h
index 73a96637a..73a96637a 100644
--- a/atari/ctxmenu.h
+++ b/frontends/atari/ctxmenu.h
diff --git a/atari/deskmenu.c b/frontends/atari/deskmenu.c
index 723835873..723835873 100644
--- a/atari/deskmenu.c
+++ b/frontends/atari/deskmenu.c
diff --git a/atari/deskmenu.h b/frontends/atari/deskmenu.h
index d1b157a2d..d1b157a2d 100644
--- a/atari/deskmenu.h
+++ b/frontends/atari/deskmenu.h
diff --git a/atari/doc/DejaVu.txt b/frontends/atari/doc/DejaVu.txt
index 254e2cc42..254e2cc42 100755
--- a/atari/doc/DejaVu.txt
+++ b/frontends/atari/doc/DejaVu.txt
diff --git a/atari/doc/bugs b/frontends/atari/doc/bugs
index 74576f67d..74576f67d 100755
--- a/atari/doc/bugs
+++ b/frontends/atari/doc/bugs
diff --git a/atari/doc/changes.txt b/frontends/atari/doc/changes.txt
index 969a44bff..969a44bff 100755
--- a/atari/doc/changes.txt
+++ b/frontends/atari/doc/changes.txt
diff --git a/atari/doc/faq.txt b/frontends/atari/doc/faq.txt
index 53dbe81f2..53dbe81f2 100755
--- a/atari/doc/faq.txt
+++ b/frontends/atari/doc/faq.txt
diff --git a/atari/doc/readme.txt b/frontends/atari/doc/readme.txt
index 829b59ec8..829b59ec8 100755
--- a/atari/doc/readme.txt
+++ b/frontends/atari/doc/readme.txt
diff --git a/atari/doc/todo.txt b/frontends/atari/doc/todo.txt
index 49f8e6570..49f8e6570 100755
--- a/atari/doc/todo.txt
+++ b/frontends/atari/doc/todo.txt
diff --git a/atari/download.c b/frontends/atari/download.c
index 9ebe78751..9ebe78751 100644
--- a/atari/download.c
+++ b/frontends/atari/download.c
diff --git a/atari/download.h b/frontends/atari/download.h
index a5be3257e..a5be3257e 100644
--- a/atari/download.h
+++ b/frontends/atari/download.h
diff --git a/atari/encoding.c b/frontends/atari/encoding.c
index 9a16cbd4e..9a16cbd4e 100644
--- a/atari/encoding.c
+++ b/frontends/atari/encoding.c
diff --git a/atari/encoding.h b/frontends/atari/encoding.h
index 784aa8273..784aa8273 100644
--- a/atari/encoding.h
+++ b/frontends/atari/encoding.h
diff --git a/atari/extract.php b/frontends/atari/extract.php
index 865b70ed7..865b70ed7 100755
--- a/atari/extract.php
+++ b/frontends/atari/extract.php
diff --git a/atari/file.c b/frontends/atari/file.c
index 499edd627..499edd627 100644
--- a/atari/file.c
+++ b/frontends/atari/file.c
diff --git a/atari/file.h b/frontends/atari/file.h
index b368567c7..b368567c7 100644
--- a/atari/file.h
+++ b/frontends/atari/file.h
diff --git a/atari/filetype.c b/frontends/atari/filetype.c
index 1cce6fc18..1cce6fc18 100644
--- a/atari/filetype.c
+++ b/frontends/atari/filetype.c
diff --git a/atari/filetype.h b/frontends/atari/filetype.h
index 97ba75b80..97ba75b80 100644
--- a/atari/filetype.h
+++ b/frontends/atari/filetype.h
diff --git a/atari/findfile.c b/frontends/atari/findfile.c
index 45ca6d916..45ca6d916 100644
--- a/atari/findfile.c
+++ b/frontends/atari/findfile.c
diff --git a/atari/findfile.h b/frontends/atari/findfile.h
index 9cda2a0be..9cda2a0be 100644
--- a/atari/findfile.h
+++ b/frontends/atari/findfile.h
diff --git a/atari/font.c b/frontends/atari/font.c
index cb0c574ea..cb0c574ea 100644
--- a/atari/font.c
+++ b/frontends/atari/font.c
diff --git a/atari/font.h b/frontends/atari/font.h
index a01d000c0..a01d000c0 100644
--- a/atari/font.h
+++ b/frontends/atari/font.h
diff --git a/atari/gemtk/aestabs.c b/frontends/atari/gemtk/aestabs.c
index 519676514..519676514 100644
--- a/atari/gemtk/aestabs.c
+++ b/frontends/atari/gemtk/aestabs.c
diff --git a/atari/gemtk/aestabs.h b/frontends/atari/gemtk/aestabs.h
index c72054acc..c72054acc 100644
--- a/atari/gemtk/aestabs.h
+++ b/frontends/atari/gemtk/aestabs.h
diff --git a/atari/gemtk/dragdrop.c b/frontends/atari/gemtk/dragdrop.c
index a4b7b82a3..a4b7b82a3 100755
--- a/atari/gemtk/dragdrop.c
+++ b/frontends/atari/gemtk/dragdrop.c
diff --git a/atari/gemtk/dragdrop.h b/frontends/atari/gemtk/dragdrop.h
index 38466137b..38466137b 100755
--- a/atari/gemtk/dragdrop.h
+++ b/frontends/atari/gemtk/dragdrop.h
diff --git a/atari/gemtk/gemtk.h b/frontends/atari/gemtk/gemtk.h
index e5915e6eb..e5915e6eb 100644
--- a/atari/gemtk/gemtk.h
+++ b/frontends/atari/gemtk/gemtk.h
diff --git a/atari/gemtk/guiwin.c b/frontends/atari/gemtk/guiwin.c
index ea0f8f917..ea0f8f917 100644
--- a/atari/gemtk/guiwin.c
+++ b/frontends/atari/gemtk/guiwin.c
diff --git a/atari/gemtk/guiwin.h b/frontends/atari/gemtk/guiwin.h
index 6daf16ca9..6daf16ca9 100644
--- a/atari/gemtk/guiwin.h
+++ b/frontends/atari/gemtk/guiwin.h
diff --git a/atari/gemtk/msgbox.c b/frontends/atari/gemtk/msgbox.c
index 89ca75a46..89ca75a46 100644
--- a/atari/gemtk/msgbox.c
+++ b/frontends/atari/gemtk/msgbox.c
diff --git a/atari/gemtk/msgbox.h b/frontends/atari/gemtk/msgbox.h
index 7a46900ef..7a46900ef 100644
--- a/atari/gemtk/msgbox.h
+++ b/frontends/atari/gemtk/msgbox.h
diff --git a/atari/gemtk/objc.c b/frontends/atari/gemtk/objc.c
index 855413e0b..855413e0b 100644
--- a/atari/gemtk/objc.c
+++ b/frontends/atari/gemtk/objc.c
diff --git a/atari/gemtk/objc.h b/frontends/atari/gemtk/objc.h
index 6fa1072b7..6fa1072b7 100644
--- a/atari/gemtk/objc.h
+++ b/frontends/atari/gemtk/objc.h
diff --git a/atari/gemtk/redrawslots.c b/frontends/atari/gemtk/redrawslots.c
index ee5627daf..ee5627daf 100644
--- a/atari/gemtk/redrawslots.c
+++ b/frontends/atari/gemtk/redrawslots.c
diff --git a/atari/gemtk/redrawslots.h b/frontends/atari/gemtk/redrawslots.h
index 9691fb4bc..9691fb4bc 100644
--- a/atari/gemtk/redrawslots.h
+++ b/frontends/atari/gemtk/redrawslots.h
diff --git a/atari/gemtk/utils.c b/frontends/atari/gemtk/utils.c
index 63e6330ec..63e6330ec 100644
--- a/atari/gemtk/utils.c
+++ b/frontends/atari/gemtk/utils.c
diff --git a/atari/gemtk/utils.h b/frontends/atari/gemtk/utils.h
index 7ebbcf228..7ebbcf228 100644
--- a/atari/gemtk/utils.h
+++ b/frontends/atari/gemtk/utils.h
diff --git a/atari/gemtk/vaproto.c b/frontends/atari/gemtk/vaproto.c
index 45e47225c..45e47225c 100644
--- a/atari/gemtk/vaproto.c
+++ b/frontends/atari/gemtk/vaproto.c
diff --git a/atari/gemtk/vaproto.h b/frontends/atari/gemtk/vaproto.h
index 84e0ecf0b..84e0ecf0b 100644
--- a/atari/gemtk/vaproto.h
+++ b/frontends/atari/gemtk/vaproto.h
diff --git a/atari/gui.c b/frontends/atari/gui.c
index 810c7646f..810c7646f 100644
--- a/atari/gui.c
+++ b/frontends/atari/gui.c
diff --git a/atari/gui.h b/frontends/atari/gui.h
index 50184d029..50184d029 100644
--- a/atari/gui.h
+++ b/frontends/atari/gui.h
diff --git a/atari/history.c b/frontends/atari/history.c
index ba72c7f00..ba72c7f00 100644
--- a/atari/history.c
+++ b/frontends/atari/history.c
diff --git a/atari/history.h b/frontends/atari/history.h
index 06a5d32f2..06a5d32f2 100644
--- a/atari/history.h
+++ b/frontends/atari/history.h
diff --git a/atari/hotlist.c b/frontends/atari/hotlist.c
index 1130e6251..1130e6251 100644
--- a/atari/hotlist.c
+++ b/frontends/atari/hotlist.c
diff --git a/atari/hotlist.h b/frontends/atari/hotlist.h
index 159878233..159878233 100644
--- a/atari/hotlist.h
+++ b/frontends/atari/hotlist.h
diff --git a/atari/login.c b/frontends/atari/login.c
index c44b07750..c44b07750 100644
--- a/atari/login.c
+++ b/frontends/atari/login.c
diff --git a/atari/login.h b/frontends/atari/login.h
index b61808c71..b61808c71 100644
--- a/atari/login.h
+++ b/frontends/atari/login.h
diff --git a/atari/misc.c b/frontends/atari/misc.c
index 8688b93fd..8688b93fd 100644
--- a/atari/misc.c
+++ b/frontends/atari/misc.c
diff --git a/atari/misc.h b/frontends/atari/misc.h
index e581c23b2..e581c23b2 100644
--- a/atari/misc.h
+++ b/frontends/atari/misc.h
diff --git a/atari/options.h b/frontends/atari/options.h
index 4ae847d74..4ae847d74 100644
--- a/atari/options.h
+++ b/frontends/atari/options.h
diff --git a/atari/osspec.c b/frontends/atari/osspec.c
index f64402e8d..f64402e8d 100644
--- a/atari/osspec.c
+++ b/frontends/atari/osspec.c
diff --git a/atari/osspec.h b/frontends/atari/osspec.h
index 0c8d4cf66..0c8d4cf66 100644
--- a/atari/osspec.h
+++ b/frontends/atari/osspec.h
diff --git a/atari/plot/eddi.h b/frontends/atari/plot/eddi.h
index 7d6b90d4b..7d6b90d4b 100644
--- a/atari/plot/eddi.h
+++ b/frontends/atari/plot/eddi.h
diff --git a/atari/plot/eddi.s b/frontends/atari/plot/eddi.s
index f0ea18a1e..f0ea18a1e 100644
--- a/atari/plot/eddi.s
+++ b/frontends/atari/plot/eddi.s
diff --git a/atari/plot/font_freetype.c b/frontends/atari/plot/font_freetype.c
index a77aff855..a77aff855 100644
--- a/atari/plot/font_freetype.c
+++ b/frontends/atari/plot/font_freetype.c
diff --git a/atari/plot/font_freetype.h b/frontends/atari/plot/font_freetype.h
index 58a5372a4..58a5372a4 100644
--- a/atari/plot/font_freetype.h
+++ b/frontends/atari/plot/font_freetype.h
diff --git a/atari/plot/font_internal.c b/frontends/atari/plot/font_internal.c
index 89a56d0e5..89a56d0e5 100644
--- a/atari/plot/font_internal.c
+++ b/frontends/atari/plot/font_internal.c
diff --git a/atari/plot/font_internal.h b/frontends/atari/plot/font_internal.h
index 9bfbbedef..9bfbbedef 100644
--- a/atari/plot/font_internal.h
+++ b/frontends/atari/plot/font_internal.h
diff --git a/atari/plot/font_vdi.c b/frontends/atari/plot/font_vdi.c
index ef5499207..ef5499207 100644
--- a/atari/plot/font_vdi.c
+++ b/frontends/atari/plot/font_vdi.c
diff --git a/atari/plot/font_vdi.h b/frontends/atari/plot/font_vdi.h
index 3a1fdb54b..3a1fdb54b 100644
--- a/atari/plot/font_vdi.h
+++ b/frontends/atari/plot/font_vdi.h
diff --git a/atari/plot/fontplot.c b/frontends/atari/plot/fontplot.c
index 9f0edd9a4..9f0edd9a4 100644
--- a/atari/plot/fontplot.c
+++ b/frontends/atari/plot/fontplot.c
diff --git a/atari/plot/fontplot.h b/frontends/atari/plot/fontplot.h
index 6690bff2c..6690bff2c 100644
--- a/atari/plot/fontplot.h
+++ b/frontends/atari/plot/fontplot.h
diff --git a/atari/plot/plot.c b/frontends/atari/plot/plot.c
index 45e4cead2..45e4cead2 100644
--- a/atari/plot/plot.c
+++ b/frontends/atari/plot/plot.c
diff --git a/atari/plot/plot.h b/frontends/atari/plot/plot.h
index 22f8781c2..22f8781c2 100644
--- a/atari/plot/plot.h
+++ b/frontends/atari/plot/plot.h
diff --git a/atari/redrawslots.c b/frontends/atari/redrawslots.c
index f5351866a..f5351866a 100644
--- a/atari/redrawslots.c
+++ b/frontends/atari/redrawslots.c
diff --git a/atari/redrawslots.h b/frontends/atari/redrawslots.h
index ca72a0172..ca72a0172 100644
--- a/atari/redrawslots.h
+++ b/frontends/atari/redrawslots.h
diff --git a/atari/res/blank b/frontends/atari/res/blank
index f21f228a1..f21f228a1 100644
--- a/atari/res/blank
+++ b/frontends/atari/res/blank
diff --git a/atari/res/favicon.ico b/frontends/atari/res/favicon.ico
index 8b26a278f..8b26a278f 100644
--- a/atari/res/favicon.ico
+++ b/frontends/atari/res/favicon.ico
diff --git a/atari/res/icons/toolbar/atfact/main.png b/frontends/atari/res/icons/toolbar/atfact/main.png
index 64cf3bc54..64cf3bc54 100644
--- a/atari/res/icons/toolbar/atfact/main.png
+++ b/frontends/atari/res/icons/toolbar/atfact/main.png
diff --git a/atari/res/icons/toolbar/atfact/throbber.png b/frontends/atari/res/icons/toolbar/atfact/throbber.png
index 44d949a1c..44d949a1c 100644
--- a/atari/res/icons/toolbar/atfact/throbber.png
+++ b/frontends/atari/res/icons/toolbar/atfact/throbber.png
diff --git a/atari/res/icons/toolbar/default/main.png b/frontends/atari/res/icons/toolbar/default/main.png
index 964218076..964218076 100644
--- a/atari/res/icons/toolbar/default/main.png
+++ b/frontends/atari/res/icons/toolbar/default/main.png
diff --git a/atari/res/icons/toolbar/default/main.xcf b/frontends/atari/res/icons/toolbar/default/main.xcf
index 48d6d168c..48d6d168c 100644
--- a/atari/res/icons/toolbar/default/main.xcf
+++ b/frontends/atari/res/icons/toolbar/default/main.xcf
diff --git a/atari/res/icons/toolbar/default/throbber.png b/frontends/atari/res/icons/toolbar/default/throbber.png
index be3bf9949..be3bf9949 100644
--- a/atari/res/icons/toolbar/default/throbber.png
+++ b/frontends/atari/res/icons/toolbar/default/throbber.png
diff --git a/atari/res/icons/toolbar/default/throbber.xcf b/frontends/atari/res/icons/toolbar/default/throbber.xcf
index 18646c9c9..18646c9c9 100644
--- a/atari/res/icons/toolbar/default/throbber.xcf
+++ b/frontends/atari/res/icons/toolbar/default/throbber.xcf
diff --git a/atari/res/languages b/frontends/atari/res/languages
index 4927e03a0..4927e03a0 100644
--- a/atari/res/languages
+++ b/frontends/atari/res/languages
diff --git a/atari/res/netsurf.rsc b/frontends/atari/res/netsurf.rsc
index 9c7d8dd74..9c7d8dd74 100755
--- a/atari/res/netsurf.rsc
+++ b/frontends/atari/res/netsurf.rsc
diff --git a/atari/res/netsurf.rsh b/frontends/atari/res/netsurf.rsh
index c856501ae..c856501ae 100755
--- a/atari/res/netsurf.rsh
+++ b/frontends/atari/res/netsurf.rsh
diff --git a/atari/res/netsurf.rsm b/frontends/atari/res/netsurf.rsm
index 6c240d371..6c240d371 100755
--- a/atari/res/netsurf.rsm
+++ b/frontends/atari/res/netsurf.rsm
diff --git a/atari/rootwin.c b/frontends/atari/rootwin.c
index 605ce45ae..605ce45ae 100644
--- a/atari/rootwin.c
+++ b/frontends/atari/rootwin.c
diff --git a/atari/rootwin.h b/frontends/atari/rootwin.h
index 99b286f70..99b286f70 100644
--- a/atari/rootwin.h
+++ b/frontends/atari/rootwin.h
diff --git a/atari/save.h b/frontends/atari/save.h
index 01086be4b..01086be4b 100644
--- a/atari/save.h
+++ b/frontends/atari/save.h
diff --git a/atari/schedule.c b/frontends/atari/schedule.c
index 48980426d..48980426d 100644
--- a/atari/schedule.c
+++ b/frontends/atari/schedule.c
diff --git a/atari/schedule.h b/frontends/atari/schedule.h
index 05eebb2d7..05eebb2d7 100644
--- a/atari/schedule.h
+++ b/frontends/atari/schedule.h
diff --git a/atari/scripts/env-v4e.sh b/frontends/atari/scripts/env-v4e.sh
index 6e353ffe4..6e353ffe4 100755
--- a/atari/scripts/env-v4e.sh
+++ b/frontends/atari/scripts/env-v4e.sh
diff --git a/atari/scripts/env-x86.sh b/frontends/atari/scripts/env-x86.sh
index 027da3f3b..027da3f3b 100755
--- a/atari/scripts/env-x86.sh
+++ b/frontends/atari/scripts/env-x86.sh
diff --git a/atari/search.c b/frontends/atari/search.c
index d72d3caaa..d72d3caaa 100644
--- a/atari/search.c
+++ b/frontends/atari/search.c
diff --git a/atari/search.h b/frontends/atari/search.h
index 04dfed4eb..04dfed4eb 100644
--- a/atari/search.h
+++ b/frontends/atari/search.h
diff --git a/atari/settings.c b/frontends/atari/settings.c
index b6df12760..b6df12760 100644
--- a/atari/settings.c
+++ b/frontends/atari/settings.c
diff --git a/atari/settings.h b/frontends/atari/settings.h
index ac7bd8aa4..ac7bd8aa4 100644
--- a/atari/settings.h
+++ b/frontends/atari/settings.h
diff --git a/atari/statusbar.c b/frontends/atari/statusbar.c
index c9d0f78aa..c9d0f78aa 100644
--- a/atari/statusbar.c
+++ b/frontends/atari/statusbar.c
diff --git a/atari/statusbar.h b/frontends/atari/statusbar.h
index 8ac090497..8ac090497 100644
--- a/atari/statusbar.h
+++ b/frontends/atari/statusbar.h
diff --git a/atari/toolbar.c b/frontends/atari/toolbar.c
index f630332da..f630332da 100644
--- a/atari/toolbar.c
+++ b/frontends/atari/toolbar.c
diff --git a/atari/toolbar.h b/frontends/atari/toolbar.h
index 61ae48c82..61ae48c82 100644
--- a/atari/toolbar.h
+++ b/frontends/atari/toolbar.h
diff --git a/atari/treeview.c b/frontends/atari/treeview.c
index 513e2dfe9..513e2dfe9 100644
--- a/atari/treeview.c
+++ b/frontends/atari/treeview.c
diff --git a/atari/treeview.h b/frontends/atari/treeview.h
index a6b4a62e9..a6b4a62e9 100644
--- a/atari/treeview.h
+++ b/frontends/atari/treeview.h
diff --git a/atari/verify_ssl.c b/frontends/atari/verify_ssl.c
index cbd9d0bf6..cbd9d0bf6 100644
--- a/atari/verify_ssl.c
+++ b/frontends/atari/verify_ssl.c
diff --git a/atari/verify_ssl.h b/frontends/atari/verify_ssl.h
index b69bc9cfb..b69bc9cfb 100644
--- a/atari/verify_ssl.h
+++ b/frontends/atari/verify_ssl.h
diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
new file mode 100644
index 000000000..8a79fc5ec
--- /dev/null
+++ b/frontends/beos/Makefile
@@ -0,0 +1,102 @@
+# ----------------------------------------------------------------------------
+# BeOS target setup
+# ----------------------------------------------------------------------------
+
+# Linker flags
+LDFLAGS += -L/boot/home/config/lib
+LDFLAGS += -L/boot/common/lib
+LDFLAGS += -lbe -ltranslation -ltracker -lcolumnlistview -lnetwork
+ifeq ($(CC_MAJOR),2)
+    LDFLAGS += -lstdc++.r4
+else
+    LDFLAGS += -lstdc++ -lsupc++
+endif
+
+COMMON_WARNFLAGS += -Wno-multichar
+
+# compiler flags
+CFLAGS += -std=c99 -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g
+CXXFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g
+
+BEOS_BERES := beres
+BEOS_RC := rc
+BEOS_XRES := xres
+BEOS_SETVER := setversion
+BEOS_MIMESET := mimeset
+
+VERSION_FULL := $(shell sed -n '/_version.*=.*"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c)
+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)
+
+# ----------------------------------------------------------------------------
+# Source file setup
+# ----------------------------------------------------------------------------
+
+# sources purely for the BeOS build
+S_FRONTEND := about.cpp bitmap.cpp cookies.cpp download.cpp		\
+	fetch_rsrc.cpp filetype.cpp font.cpp gui.cpp login.cpp		\
+	gui_options.cpp plotters.cpp scaffolding.cpp search.cpp		\
+	schedule.cpp throbber.cpp window.cpp
+
+# This is the final source build list
+# Note this is deliberately *not* expanded here as common and image
+#   are not yet available
+SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND)
+EXETARGET := NetSurf
+
+# The filter and target for split messages
+MESSAGES_FILTER=beos
+MESSAGES_TARGET=$(FRONTEND_RESOURCES_DIR)
+
+# ----------------------------------------------------------------------------
+# Resources
+# ----------------------------------------------------------------------------
+
+RDEF_BEOS := res.rdef
+RDEF_BEOS := $(addprefix $(FRONTEND_SOURCE_DIR)/,$(RDEF_BEOS))
+
+RDEF_IMP_BEOS := res_import.rdef
+RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS)))
+
+RDEP_BEOS := \
+	adblock.css beosdefault.css default.css internal.css quirks.css	\
+	netsurf.png favicon.png ca-bundle.txt \
+	credits.html licence.html welcome.html maps.html SearchEngines
+
+RDEP_BEOS := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(RDEP_BEOS))	\
+	$(wildcard $(FRONTEND_RESOURCES_DIR)/icons/*.png)		\
+	$(wildcard $(FRONTEND_RESOURCES_DIR)/??/*)			\
+	$(wildcard $(FRONTEND_RESOURCES_DIR)/throbber/throbber*.png)
+
+RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS))))
+RESOURCES = $(RSRC_BEOS)
+
+$(RDEF_IMP_BEOS): $(RDEP_BEOS)
+	$(VQ)echo "     GEN: $@"
+	$(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") #'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@
+
+$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
+	$(VQ)echo "      RC: $<"
+	$(Q)$(BEOS_RC) -I beos -o $@ $^
+
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-beos:
+	mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
+	mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+	@copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
+	@cp -vRL $(FRONTEND_RESOURCES_DIR)/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+	@cp -vRL $(FRONTEND_RESOURCES_DIR)/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+	@cp -vRL $(FRONTEND_RESOURCES_DIR)/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+	@cp -vRL $(FRONTEND_RESOURCES_DIR)/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+	@cp -vRL $(FRONTEND_RESOURCES_DIR)/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+	@cp -vRL $(FRONTEND_RESOURCES_DIR)/SearchEngines $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-beos:
diff --git a/beos/Makefile.defaults b/frontends/beos/Makefile.defaults
index 7616a41a3..7616a41a3 100644
--- a/beos/Makefile.defaults
+++ b/frontends/beos/Makefile.defaults
diff --git a/beos/WindowStack.h b/frontends/beos/WindowStack.h
index 947b14360..947b14360 100644
--- a/beos/WindowStack.h
+++ b/frontends/beos/WindowStack.h
diff --git a/beos/about.cpp b/frontends/beos/about.cpp
index 89eb81829..89eb81829 100644
--- a/beos/about.cpp
+++ b/frontends/beos/about.cpp
diff --git a/beos/about.h b/frontends/beos/about.h
index f80d33f01..f80d33f01 100644
--- a/beos/about.h
+++ b/frontends/beos/about.h
diff --git a/beos/beos_res.rsrc b/frontends/beos/beos_res.rsrc
index d37e9e6ec..d37e9e6ec 100644
--- a/beos/beos_res.rsrc
+++ b/frontends/beos/beos_res.rsrc
diff --git a/beos/bitmap.cpp b/frontends/beos/bitmap.cpp
index 26b7a3957..26b7a3957 100644
--- a/beos/bitmap.cpp
+++ b/frontends/beos/bitmap.cpp
diff --git a/beos/bitmap.h b/frontends/beos/bitmap.h
index bcf5f7b8d..bcf5f7b8d 100644
--- a/beos/bitmap.h
+++ b/frontends/beos/bitmap.h
diff --git a/beos/cookies.cpp b/frontends/beos/cookies.cpp
index d1357fffa..d1357fffa 100644
--- a/beos/cookies.cpp
+++ b/frontends/beos/cookies.cpp
diff --git a/beos/cookies.h b/frontends/beos/cookies.h
index 977ccd232..977ccd232 100644
--- a/beos/cookies.h
+++ b/frontends/beos/cookies.h
diff --git a/beos/download.cpp b/frontends/beos/download.cpp
index ea0271e60..ea0271e60 100644
--- a/beos/download.cpp
+++ b/frontends/beos/download.cpp
diff --git a/beos/download.h b/frontends/beos/download.h
index 0ce387efc..0ce387efc 100644
--- a/beos/download.h
+++ b/frontends/beos/download.h
diff --git a/beos/fetch_rsrc.cpp b/frontends/beos/fetch_rsrc.cpp
index b771f7b2d..b771f7b2d 100644
--- a/beos/fetch_rsrc.cpp
+++ b/frontends/beos/fetch_rsrc.cpp
diff --git a/beos/fetch_rsrc.h b/frontends/beos/fetch_rsrc.h
index ce17670a4..ce17670a4 100644
--- a/beos/fetch_rsrc.h
+++ b/frontends/beos/fetch_rsrc.h
diff --git a/beos/filetype.cpp b/frontends/beos/filetype.cpp
index 75a33240a..75a33240a 100644
--- a/beos/filetype.cpp
+++ b/frontends/beos/filetype.cpp
diff --git a/beos/filetype.h b/frontends/beos/filetype.h
index 72252dbd0..72252dbd0 100644
--- a/beos/filetype.h
+++ b/frontends/beos/filetype.h
diff --git a/beos/font.cpp b/frontends/beos/font.cpp
index 003af52b5..003af52b5 100644
--- a/beos/font.cpp
+++ b/frontends/beos/font.cpp
diff --git a/beos/font.h b/frontends/beos/font.h
index 63909efcf..63909efcf 100644
--- a/beos/font.h
+++ b/frontends/beos/font.h
diff --git a/beos/gui.cpp b/frontends/beos/gui.cpp
index 2e0aa4cc5..2e0aa4cc5 100644
--- a/beos/gui.cpp
+++ b/frontends/beos/gui.cpp
diff --git a/beos/gui.h b/frontends/beos/gui.h
index 774820baa..774820baa 100644
--- a/beos/gui.h
+++ b/frontends/beos/gui.h
diff --git a/beos/gui_options.cpp b/frontends/beos/gui_options.cpp
index 035c62941..035c62941 100644
--- a/beos/gui_options.cpp
+++ b/frontends/beos/gui_options.cpp
diff --git a/beos/gui_options.h b/frontends/beos/gui_options.h
index e5c91a797..e5c91a797 100644
--- a/beos/gui_options.h
+++ b/frontends/beos/gui_options.h
diff --git a/beos/login.cpp b/frontends/beos/login.cpp
index 7689c9d35..7689c9d35 100644
--- a/beos/login.cpp
+++ b/frontends/beos/login.cpp
diff --git a/beos/options.h b/frontends/beos/options.h
index 40d23a3bc..40d23a3bc 100644
--- a/beos/options.h
+++ b/frontends/beos/options.h
diff --git a/beos/plotters.cpp b/frontends/beos/plotters.cpp
index 3fd786ecd..3fd786ecd 100644
--- a/beos/plotters.cpp
+++ b/frontends/beos/plotters.cpp
diff --git a/beos/plotters.h b/frontends/beos/plotters.h
index 523f3c7c6..523f3c7c6 100644
--- a/beos/plotters.h
+++ b/frontends/beos/plotters.h
diff --git a/beos/res.h b/frontends/beos/res.h
index 278ffb545..278ffb545 100644
--- a/beos/res.h
+++ b/frontends/beos/res.h
diff --git a/beos/res.rdef b/frontends/beos/res.rdef
index 07012356c..07012356c 100644
--- a/beos/res.rdef
+++ b/frontends/beos/res.rdef
diff --git a/beos/res/SearchEngines b/frontends/beos/res/SearchEngines
index df5252e07..df5252e07 120000
--- a/beos/res/SearchEngines
+++ b/frontends/beos/res/SearchEngines
diff --git a/beos/res/adblock.css b/frontends/beos/res/adblock.css
index e3811f62b..e3811f62b 120000
--- a/beos/res/adblock.css
+++ b/frontends/beos/res/adblock.css
diff --git a/beos/res/beosdefault.css b/frontends/beos/res/beosdefault.css
index 9b457d448..9b457d448 100644
--- a/beos/res/beosdefault.css
+++ b/frontends/beos/res/beosdefault.css
diff --git a/beos/res/ca-bundle.txt b/frontends/beos/res/ca-bundle.txt
index ad2dd6b55..ad2dd6b55 120000
--- a/beos/res/ca-bundle.txt
+++ b/frontends/beos/res/ca-bundle.txt
diff --git a/beos/res/credits.html b/frontends/beos/res/credits.html
index ca85d3d27..ca85d3d27 120000
--- a/beos/res/credits.html
+++ b/frontends/beos/res/credits.html
diff --git a/beos/res/de/welcome.html b/frontends/beos/res/de/welcome.html
index b2ddfc796..b2ddfc796 120000
--- a/beos/res/de/welcome.html
+++ b/frontends/beos/res/de/welcome.html
diff --git a/beos/res/default.css b/frontends/beos/res/default.css
index 6d2d4da5b..6d2d4da5b 120000
--- a/beos/res/default.css
+++ b/frontends/beos/res/default.css
diff --git a/beos/res/en/credits.html b/frontends/beos/res/en/credits.html
index 1ba17392b..1ba17392b 120000
--- a/beos/res/en/credits.html
+++ b/frontends/beos/res/en/credits.html
diff --git a/beos/res/en/licence.html b/frontends/beos/res/en/licence.html
index 147dd6db2..147dd6db2 120000
--- a/beos/res/en/licence.html
+++ b/frontends/beos/res/en/licence.html
diff --git a/beos/res/en/maps.html b/frontends/beos/res/en/maps.html
index bb1eedd5a..bb1eedd5a 120000
--- a/beos/res/en/maps.html
+++ b/frontends/beos/res/en/maps.html
diff --git a/beos/res/en/welcome.html b/frontends/beos/res/en/welcome.html
index 28362130a..28362130a 120000
--- a/beos/res/en/welcome.html
+++ b/frontends/beos/res/en/welcome.html
diff --git a/beos/res/favicon.png b/frontends/beos/res/favicon.png
index d968c3827..d968c3827 120000
--- a/beos/res/favicon.png
+++ b/frontends/beos/res/favicon.png
diff --git a/beos/res/icons b/frontends/beos/res/icons
index 4a0ebabc6..4a0ebabc6 120000
--- a/beos/res/icons
+++ b/frontends/beos/res/icons
diff --git a/beos/res/internal.css b/frontends/beos/res/internal.css
index e777d8ae1..e777d8ae1 120000
--- a/beos/res/internal.css
+++ b/frontends/beos/res/internal.css
diff --git a/beos/res/it/credits.html b/frontends/beos/res/it/credits.html
index 6e1e15ed5..6e1e15ed5 120000
--- a/beos/res/it/credits.html
+++ b/frontends/beos/res/it/credits.html
diff --git a/beos/res/it/licence.html b/frontends/beos/res/it/licence.html
index 3a7c056b6..3a7c056b6 120000
--- a/beos/res/it/licence.html
+++ b/frontends/beos/res/it/licence.html
diff --git a/beos/res/it/welcome.html b/frontends/beos/res/it/welcome.html
index dea1e839c..dea1e839c 120000
--- a/beos/res/it/welcome.html
+++ b/frontends/beos/res/it/welcome.html
diff --git a/beos/res/ja/welcome.html b/frontends/beos/res/ja/welcome.html
index 827796f02..827796f02 120000
--- a/beos/res/ja/welcome.html
+++ b/frontends/beos/res/ja/welcome.html
diff --git a/beos/res/licence.html b/frontends/beos/res/licence.html
index 86f8c54bf..86f8c54bf 120000
--- a/beos/res/licence.html
+++ b/frontends/beos/res/licence.html
diff --git a/gtk/res/license b/frontends/beos/res/license
index 6c2a58f90..6c2a58f90 100644
--- a/gtk/res/license
+++ b/frontends/beos/res/license
diff --git a/beos/res/maps.html b/frontends/beos/res/maps.html
index a32f725fb..a32f725fb 120000
--- a/beos/res/maps.html
+++ b/frontends/beos/res/maps.html
diff --git a/beos/res/netsurf.png b/frontends/beos/res/netsurf.png
index 0fbf42709..0fbf42709 120000
--- a/beos/res/netsurf.png
+++ b/frontends/beos/res/netsurf.png
diff --git a/beos/res/quirks.css b/frontends/beos/res/quirks.css
index d9fb80334..d9fb80334 120000
--- a/beos/res/quirks.css
+++ b/frontends/beos/res/quirks.css
diff --git a/beos/res/throbber/throbber0.png b/frontends/beos/res/throbber/throbber0.png
index 7c79be47b..7c79be47b 100644
--- a/beos/res/throbber/throbber0.png
+++ b/frontends/beos/res/throbber/throbber0.png
diff --git a/beos/res/throbber/throbber1.png b/frontends/beos/res/throbber/throbber1.png
index b5b83a465..b5b83a465 100644
--- a/beos/res/throbber/throbber1.png
+++ b/frontends/beos/res/throbber/throbber1.png
diff --git a/beos/res/throbber/throbber2.png b/frontends/beos/res/throbber/throbber2.png
index dc1019dbd..dc1019dbd 100644
--- a/beos/res/throbber/throbber2.png
+++ b/frontends/beos/res/throbber/throbber2.png
diff --git a/beos/res/throbber/throbber3.png b/frontends/beos/res/throbber/throbber3.png
index 5d458ac0b..5d458ac0b 100644
--- a/beos/res/throbber/throbber3.png
+++ b/frontends/beos/res/throbber/throbber3.png
diff --git a/beos/res/throbber/throbber4.png b/frontends/beos/res/throbber/throbber4.png
index 4940aba02..4940aba02 100644
--- a/beos/res/throbber/throbber4.png
+++ b/frontends/beos/res/throbber/throbber4.png
diff --git a/beos/res/throbber/throbber5.png b/frontends/beos/res/throbber/throbber5.png
index 4c70ba64b..4c70ba64b 100644
--- a/beos/res/throbber/throbber5.png
+++ b/frontends/beos/res/throbber/throbber5.png
diff --git a/beos/res/throbber/throbber6.png b/frontends/beos/res/throbber/throbber6.png
index 3242b06b4..3242b06b4 100644
--- a/beos/res/throbber/throbber6.png
+++ b/frontends/beos/res/throbber/throbber6.png
diff --git a/beos/res/throbber/throbber7.png b/frontends/beos/res/throbber/throbber7.png
index c4605101f..c4605101f 100644
--- a/beos/res/throbber/throbber7.png
+++ b/frontends/beos/res/throbber/throbber7.png
diff --git a/beos/res/throbber/throbber8.png b/frontends/beos/res/throbber/throbber8.png
index 68f451e5b..68f451e5b 100644
--- a/beos/res/throbber/throbber8.png
+++ b/frontends/beos/res/throbber/throbber8.png
diff --git a/beos/res/welcome.html b/frontends/beos/res/welcome.html
index 1abdc5e8a..1abdc5e8a 120000
--- a/beos/res/welcome.html
+++ b/frontends/beos/res/welcome.html
diff --git a/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index 630e059f2..630e059f2 100644
--- a/beos/scaffolding.cpp
+++ b/frontends/beos/scaffolding.cpp
diff --git a/beos/scaffolding.h b/frontends/beos/scaffolding.h
index 3fdca57f6..3fdca57f6 100644
--- a/beos/scaffolding.h
+++ b/frontends/beos/scaffolding.h
diff --git a/beos/schedule.cpp b/frontends/beos/schedule.cpp
index a9da53501..a9da53501 100644
--- a/beos/schedule.cpp
+++ b/frontends/beos/schedule.cpp
diff --git a/beos/schedule.h b/frontends/beos/schedule.h
index 18f1efd4d..18f1efd4d 100644
--- a/beos/schedule.h
+++ b/frontends/beos/schedule.h
diff --git a/beos/search.cpp b/frontends/beos/search.cpp
index 97e3d6d5b..97e3d6d5b 100644
--- a/beos/search.cpp
+++ b/frontends/beos/search.cpp
diff --git a/beos/throbber.cpp b/frontends/beos/throbber.cpp
index fe40b3edc..fe40b3edc 100644
--- a/beos/throbber.cpp
+++ b/frontends/beos/throbber.cpp
diff --git a/beos/throbber.h b/frontends/beos/throbber.h
index 670c60a06..670c60a06 100644
--- a/beos/throbber.h
+++ b/frontends/beos/throbber.h
diff --git a/beos/window.cpp b/frontends/beos/window.cpp
index 62624f077..62624f077 100644
--- a/beos/window.cpp
+++ b/frontends/beos/window.cpp
diff --git a/beos/window.h b/frontends/beos/window.h
index 928acca22..928acca22 100644
--- a/beos/window.h
+++ b/frontends/beos/window.h
diff --git a/cocoa/ArrowBox.h b/frontends/cocoa/ArrowBox.h
index c49fcb6e7..c49fcb6e7 100644
--- a/cocoa/ArrowBox.h
+++ b/frontends/cocoa/ArrowBox.h
diff --git a/cocoa/ArrowBox.m b/frontends/cocoa/ArrowBox.m
index 6605fcca9..6605fcca9 100644
--- a/cocoa/ArrowBox.m
+++ b/frontends/cocoa/ArrowBox.m
diff --git a/cocoa/ArrowWindow.h b/frontends/cocoa/ArrowWindow.h
index 79f422f3e..79f422f3e 100644
--- a/cocoa/ArrowWindow.h
+++ b/frontends/cocoa/ArrowWindow.h
diff --git a/cocoa/ArrowWindow.m b/frontends/cocoa/ArrowWindow.m
index 8edc32e9f..8edc32e9f 100644
--- a/cocoa/ArrowWindow.m
+++ b/frontends/cocoa/ArrowWindow.m
diff --git a/cocoa/BlackScroller.h b/frontends/cocoa/BlackScroller.h
index 34110b035..34110b035 100644
--- a/cocoa/BlackScroller.h
+++ b/frontends/cocoa/BlackScroller.h
diff --git a/cocoa/BlackScroller.m b/frontends/cocoa/BlackScroller.m
index 2ee739f3a..2ee739f3a 100644
--- a/cocoa/BlackScroller.m
+++ b/frontends/cocoa/BlackScroller.m
diff --git a/cocoa/BookmarksController.h b/frontends/cocoa/BookmarksController.h
index aa71a1ac0..aa71a1ac0 100644
--- a/cocoa/BookmarksController.h
+++ b/frontends/cocoa/BookmarksController.h
diff --git a/cocoa/BookmarksController.m b/frontends/cocoa/BookmarksController.m
index 0bd51b273..0bd51b273 100644
--- a/cocoa/BookmarksController.m
+++ b/frontends/cocoa/BookmarksController.m
diff --git a/cocoa/BrowserView.h b/frontends/cocoa/BrowserView.h
index c626c8c5b..c626c8c5b 100644
--- a/cocoa/BrowserView.h
+++ b/frontends/cocoa/BrowserView.h
diff --git a/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m
index fc50dbc64..fc50dbc64 100644
--- a/cocoa/BrowserView.m
+++ b/frontends/cocoa/BrowserView.m
diff --git a/cocoa/BrowserViewController.h b/frontends/cocoa/BrowserViewController.h
index 6b4c3e79c..6b4c3e79c 100644
--- a/cocoa/BrowserViewController.h
+++ b/frontends/cocoa/BrowserViewController.h
diff --git a/cocoa/BrowserViewController.m b/frontends/cocoa/BrowserViewController.m
index 5fa8b642d..5fa8b642d 100644
--- a/cocoa/BrowserViewController.m
+++ b/frontends/cocoa/BrowserViewController.m
diff --git a/cocoa/BrowserWindow.h b/frontends/cocoa/BrowserWindow.h
index e0b83017f..e0b83017f 100644
--- a/cocoa/BrowserWindow.h
+++ b/frontends/cocoa/BrowserWindow.h
diff --git a/cocoa/BrowserWindow.m b/frontends/cocoa/BrowserWindow.m
index f01b17a25..f01b17a25 100644
--- a/cocoa/BrowserWindow.m
+++ b/frontends/cocoa/BrowserWindow.m
diff --git a/cocoa/BrowserWindowController.h b/frontends/cocoa/BrowserWindowController.h
index 22e199509..22e199509 100644
--- a/cocoa/BrowserWindowController.h
+++ b/frontends/cocoa/BrowserWindowController.h
diff --git a/cocoa/BrowserWindowController.m b/frontends/cocoa/BrowserWindowController.m
index bfb8be05e..bfb8be05e 100644
--- a/cocoa/BrowserWindowController.m
+++ b/frontends/cocoa/BrowserWindowController.m
diff --git a/cocoa/DownloadWindowController.h b/frontends/cocoa/DownloadWindowController.h
index 47a05be39..47a05be39 100644
--- a/cocoa/DownloadWindowController.h
+++ b/frontends/cocoa/DownloadWindowController.h
diff --git a/cocoa/DownloadWindowController.m b/frontends/cocoa/DownloadWindowController.m
index 0c9d869f8..0c9d869f8 100644
--- a/cocoa/DownloadWindowController.m
+++ b/frontends/cocoa/DownloadWindowController.m
diff --git a/cocoa/FormSelectMenu.h b/frontends/cocoa/FormSelectMenu.h
index cec519296..cec519296 100644
--- a/cocoa/FormSelectMenu.h
+++ b/frontends/cocoa/FormSelectMenu.h
diff --git a/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m
index 84e04cd25..84e04cd25 100644
--- a/cocoa/FormSelectMenu.m
+++ b/frontends/cocoa/FormSelectMenu.m
diff --git a/cocoa/HistoryView.h b/frontends/cocoa/HistoryView.h
index 6ef061321..6ef061321 100644
--- a/cocoa/HistoryView.h
+++ b/frontends/cocoa/HistoryView.h
diff --git a/cocoa/HistoryView.m b/frontends/cocoa/HistoryView.m
index 7b192336e..7b192336e 100644
--- a/cocoa/HistoryView.m
+++ b/frontends/cocoa/HistoryView.m
diff --git a/cocoa/HistoryWindowController.h b/frontends/cocoa/HistoryWindowController.h
index 30ba8049a..30ba8049a 100644
--- a/cocoa/HistoryWindowController.h
+++ b/frontends/cocoa/HistoryWindowController.h
diff --git a/cocoa/HistoryWindowController.m b/frontends/cocoa/HistoryWindowController.m
index cae679b9d..cae679b9d 100644
--- a/cocoa/HistoryWindowController.m
+++ b/frontends/cocoa/HistoryWindowController.m
diff --git a/cocoa/LocalHistoryController.h b/frontends/cocoa/LocalHistoryController.h
index 3e6d1775e..3e6d1775e 100644
--- a/cocoa/LocalHistoryController.h
+++ b/frontends/cocoa/LocalHistoryController.h
diff --git a/cocoa/LocalHistoryController.m b/frontends/cocoa/LocalHistoryController.m
index b3992b614..b3992b614 100644
--- a/cocoa/LocalHistoryController.m
+++ b/frontends/cocoa/LocalHistoryController.m
diff --git a/cocoa/Makefile.target b/frontends/cocoa/Makefile
index 615c007ca..9f345c0b9 100644
--- a/cocoa/Makefile.target
+++ b/frontends/cocoa/Makefile
@@ -46,15 +46,6 @@ VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/ver
 
 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
-
-$(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),)
@@ -68,36 +59,36 @@ endif
 # Source file setup
 # ----------------------------------------------------------------------------
 
-# S_COCOA are sources purely for the Mac OS X build
-S_COCOA := \
-	BookmarksController.m \
-	BrowserView.m \
-	BrowserViewController.m \
-	BrowserWindowController.m \
-	BrowserWindow.m \
-	DownloadWindowController.m \
-	NetSurfAppDelegate.m \
-	NetsurfApp.m \
-	PreferencesWindowController.m \
-	ScrollableView.m \
-	SearchWindowController.m \
-	URLFieldCell.m \
-	Tree.m \
-	TreeView.m \
-	HistoryView.m \
-	HistoryWindowController.m \
-	FormSelectMenu.m \
-	bitmap.m \
-	fetch.m \
-	font.m \
-	gui.m \
-	plotter.m \
-	schedule.m \
-	selection.m \
-	ArrowBox.m \
-	ArrowWindow.m \
-	BlackScroller.m \
-	LocalHistoryController.m \
+# sources purely for the Mac OS X build
+S_FRONTEND := \
+	BookmarksController.m		\
+	BrowserView.m			\
+	BrowserViewController.m		\
+	BrowserWindowController.m	\
+	BrowserWindow.m			\
+	DownloadWindowController.m	\
+	NetSurfAppDelegate.m		\
+	NetsurfApp.m			\
+	PreferencesWindowController.m	\
+	ScrollableView.m		\
+	SearchWindowController.m	\
+	URLFieldCell.m			\
+	Tree.m				\
+	TreeView.m			\
+	HistoryView.m			\
+	HistoryWindowController.m	\
+	FormSelectMenu.m		\
+	bitmap.m			\
+	fetch.m				\
+	font.m				\
+	gui.m				\
+	plotter.m			\
+	schedule.m			\
+	selection.m			\
+	ArrowBox.m			\
+	ArrowWindow.m			\
+	BlackScroller.m			\
+	LocalHistoryController.m	\
 	apple_image.m
 
 S_TABBAR := \
@@ -105,23 +96,22 @@ S_TABBAR := \
 	NSString_AITruncation.m		\
 	PSMOverflowPopUpButton.m	\
 	PSMProgressIndicator.m		\
-	PSMRolloverButton.m			\
-	PSMTabBarCell.m				\
-	PSMTabBarControl.m			\
+	PSMRolloverButton.m		\
+	PSMTabBarCell.m			\
+	PSMTabBarControl.m		\
 	PSMTabBarController.m		\
 	PSMTabDragAssistant.m		\
-	PSMTabDragView.m			\
-	PSMTabDragWindow.m			\
-	PSMTabDragWindowController.m \
+	PSMTabDragView.m		\
+	PSMTabDragWindow.m		\
+	PSMTabDragWindowController.m	\
 	PSMUnifiedTabStyle.m
 
-S_COCOA := $(addprefix cocoa/,$(S_COCOA))
-S_TABBAR := $(addprefix cocoa/PSMTabBarControl/,$(S_TABBAR))
+S_FRONTEND += $(addprefix PSMTabBarControl/,$(S_TABBAR))
 
 # This is the final source build list
 # Note this is deliberately *not* expanded here as common and image
 #   are not yet available
-SOURCES = $(addprefix $(shell pwd)/,$(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_COCOA) $(S_TABBAR))
+SOURCES = $(addprefix $(shell pwd)/,$(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND))
 
 # Since we prefix the sources with the pwd, also create a special
 # prefixed rule so that the testament is run
@@ -129,30 +119,49 @@ $(shell pwd)/content/fetchers/about.c: testament
 
 EXETARGET := NetSurf
 
-S_XIBS := MainMenu.xib Browser.xib BrowserWindow.xib DownloadWindow.xib SearchWindow.xib PreferencesWindow.xib \
-		HistoryWindow.xib BookmarksWindow.xib LocalHistoryPanel.xib
-
-R_RESOURCES := default.css adblock.css internal.css quirks.css NetSurf.icns HomeTemplate.pdf Icons ca-bundle \
+S_XIBS := \
+	MainMenu.xib		\
+	Browser.xib 		\
+	BrowserWindow.xib	\
+	DownloadWindow.xib	\
+	SearchWindow.xib	\
+	PreferencesWindow.xib	\
+	HistoryWindow.xib	\
+	BookmarksWindow.xib	\
+	LocalHistoryPanel.xib
+
+R_RESOURCES := \
+	default.css		\
+	adblock.css		\
+	internal.css		\
+	quirks.css		\
+	NetSurf.icns		\
+	HomeTemplate.pdf	\
+	Icons			\
+	ca-bundle		\
 	netsurf.png
-R_RESOURCES := $(addprefix cocoa/res/,$(R_RESOURCES))
 
-LANGUAGES := de en fr it nl
-LOCALIZED_RESOURCES := Localizable.strings
 
-TABBAR_RESOURCES := AquaTabClose_Front_Pressed.png \
-	AquaTabClose_Front_Rollover.png \
-	AquaTabClose_Front.png \
-	AquaTabCloseDirty_Front_Pressed.png \
-	AquaTabCloseDirty_Front_Rollover.png \
-	AquaTabCloseDirty_Front.png \
-	AquaTabNew.png \
-	AquaTabNewPressed.png \
-	AquaTabNewRollover.png \
-	overflowImage.png \
-	overflowImagePressed.png \
+TABBAR_RESOURCES := \
+	AquaTabClose_Front_Pressed.png		\
+	AquaTabClose_Front_Rollover.png		\
+	AquaTabClose_Front.png			\
+	AquaTabCloseDirty_Front_Pressed.png	\
+	AquaTabCloseDirty_Front_Rollover.png	\
+	AquaTabCloseDirty_Front.png		\
+	AquaTabNew.png				\
+	AquaTabNewPressed.png			\
+	AquaTabNewRollover.png			\
+	overflowImage.png			\
+	overflowImagePressed.png		\
 	pi.png
 
-R_RESOURCES += $(addprefix cocoa/PSMTabBarControl/Images/,$(TABBAR_RESOURCES))
+R_RESOURCES += $(addprefix PSMTabBarControl/Images/,$(TABBAR_RESOURCES))
+
+R_RESOURCES := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(R_RESOURCES))
+
+LANGUAGES := de en fr it nl
+LOCALIZED_RESOURCES := Localizable.strings
 
 #languiage project macro
 # $1 is language name
@@ -170,13 +179,13 @@ endef
 define compile_xib
 $$(OBJROOT)/$(2).lproj: $$(OBJROOT)/$(2).lproj/$(1:.xib=.nib)
 
-$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(1) $$(OBJROOT)/created
+$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): $(FRONTEND_RESOURCES_DIR)/$(1) $$(OBJROOT)/created
 	$(VQ)echo Compiling XIB $(1) for language $(2)
 	$(Q)mkdir -p $$(OBJROOT)/$(2).lproj
-	$(Q)cocoa/compile-xib.sh cocoa/res/$(1) $(2) $$@
+	$(Q)cocoa/compile-xib.sh $(FRONTEND_RESOURCES_DIR)/$(1) $(2) $$@
 
-ifeq ($(wildcard cocoa/res/$(2).lproj/$(1).strings),cocoa/res/$(2).lproj/$(1).strings)
-$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(2).lproj/$(1).strings
+ifeq ($(wildcard $(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings),$(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings)
+$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): $(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings
 endif
 
 endef
@@ -190,7 +199,7 @@ $(foreach lang,$(LANGUAGES),$(foreach xib,$(S_XIBS),$(eval $(call compile_xib,$(
 
 install-cocoa: NetSurf.app
 
-NetSurf.app: NetSurf cocoa/Makefile.target $(R_RESOURCES) NetSurf.app/Contents/Info.plist
+NetSurf.app: NetSurf $(FRONTEND_SOURCE_DIR)/Makefile $(R_RESOURCES) NetSurf.app/Contents/Info.plist
 	$(VQ)echo Assembling NetSurf.app bundle
 	$(Q)mkdir -p NetSurf.app/Contents/MacOS
 	$(Q)cp NetSurf NetSurf.app/Contents/MacOS
@@ -199,7 +208,7 @@ NetSurf.app: NetSurf cocoa/Makefile.target $(R_RESOURCES) NetSurf.app/Contents/I
 	$(Q)cp -pLR $(R_RESOURCES) NetSurf.app/Contents/Resources
 	$(Q)echo 'APPL????' > NetSurf.app/Contents/PkgInfo
 
-NetSurf.app/Contents/Info.plist: cocoa/res/NetSurf-Info.plist cocoa/Makefile.target
+NetSurf.app/Contents/Info.plist: $(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist $(FRONTEND_SOURCE_DIR)/Makefile
 	$(VQ)echo Generating Info.plist
 	$(Q)mkdir -p NetSurf.app/Contents
 	$(Q)sed -e 's/$${EXECUTABLE_NAME}/$(EXETARGET)/' \
@@ -207,7 +216,7 @@ NetSurf.app/Contents/Info.plist: cocoa/res/NetSurf-Info.plist cocoa/Makefile.tar
 	    -e 's/$${MACOSX_DEPLOYMENT_TARGET}/$(MACOSX_VERSION)/' \
 	    -e 's/$${NETSURF_VERSION}/$(VERSION_FULL)/' \
 		-e 's/$${NETSURF_SHORT_VERSION}/$(VERSION_MAJ).$(VERSION_MIN)/' \
-	   < cocoa/res/NetSurf-Info.plist > NetSurf.app/Contents/Info.plist
+	   < $(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist > NetSurf.app/Contents/Info.plist
 
 # ----------------------------------------------------------------------------
 # Package target
diff --git a/cocoa/Makefile.defaults b/frontends/cocoa/Makefile.defaults
index 8f5792b0a..8f5792b0a 100644
--- a/cocoa/Makefile.defaults
+++ b/frontends/cocoa/Makefile.defaults
diff --git a/cocoa/NetSurf.xcodeproj/project.pbxproj b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
index ef25d2f1a..ef25d2f1a 100644
--- a/cocoa/NetSurf.xcodeproj/project.pbxproj
+++ b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
diff --git a/cocoa/NetSurfAppDelegate.h b/frontends/cocoa/NetSurfAppDelegate.h
index a22c4ceee..a22c4ceee 100644
--- a/cocoa/NetSurfAppDelegate.h
+++ b/frontends/cocoa/NetSurfAppDelegate.h
diff --git a/cocoa/NetSurfAppDelegate.m b/frontends/cocoa/NetSurfAppDelegate.m
index f42856380..f42856380 100644
--- a/cocoa/NetSurfAppDelegate.m
+++ b/frontends/cocoa/NetSurfAppDelegate.m
diff --git a/cocoa/NetsurfApp.h b/frontends/cocoa/NetsurfApp.h
index 330f33826..330f33826 100644
--- a/cocoa/NetsurfApp.h
+++ b/frontends/cocoa/NetsurfApp.h
diff --git a/cocoa/NetsurfApp.m b/frontends/cocoa/NetsurfApp.m
index 6fb856098..6fb856098 100644
--- a/cocoa/NetsurfApp.m
+++ b/frontends/cocoa/NetsurfApp.m
diff --git a/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front.png
index 77d220505..77d220505 100644
--- a/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front.png
diff --git a/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Pressed.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Pressed.png
index 197ea95c2..197ea95c2 100644
--- a/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Pressed.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Pressed.png
diff --git a/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Rollover.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Rollover.png
index 2dfe5777e..2dfe5777e 100644
--- a/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Rollover.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Rollover.png
diff --git a/cocoa/PSMTabBarControl/Images/AquaTabClose_Front.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front.png
index 02b72d39e..02b72d39e 100644
--- a/cocoa/PSMTabBarControl/Images/AquaTabClose_Front.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front.png
diff --git a/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Pressed.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Pressed.png
index f81125a01..f81125a01 100644
--- a/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Pressed.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Pressed.png
diff --git a/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Rollover.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Rollover.png
index 4f6b865f7..4f6b865f7 100644
--- a/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Rollover.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Rollover.png
diff --git a/cocoa/PSMTabBarControl/Images/AquaTabNew.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabNew.png
index 10a83705d..10a83705d 100644
--- a/cocoa/PSMTabBarControl/Images/AquaTabNew.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/AquaTabNew.png
diff --git a/cocoa/PSMTabBarControl/Images/AquaTabNewPressed.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabNewPressed.png
index cb4dd10f2..cb4dd10f2 100644
--- a/cocoa/PSMTabBarControl/Images/AquaTabNewPressed.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/AquaTabNewPressed.png
diff --git a/cocoa/PSMTabBarControl/Images/AquaTabNewRollover.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabNewRollover.png
index 4d469f8a6..4d469f8a6 100644
--- a/cocoa/PSMTabBarControl/Images/AquaTabNewRollover.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/AquaTabNewRollover.png
diff --git a/cocoa/PSMTabBarControl/Images/overflowImage.png b/frontends/cocoa/PSMTabBarControl/Images/overflowImage.png
index 2b762555d..2b762555d 100644
--- a/cocoa/PSMTabBarControl/Images/overflowImage.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/overflowImage.png
diff --git a/cocoa/PSMTabBarControl/Images/overflowImagePressed.png b/frontends/cocoa/PSMTabBarControl/Images/overflowImagePressed.png
index b3918b344..b3918b344 100644
--- a/cocoa/PSMTabBarControl/Images/overflowImagePressed.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/overflowImagePressed.png
diff --git a/cocoa/PSMTabBarControl/Images/pi.png b/frontends/cocoa/PSMTabBarControl/Images/pi.png
index 4d598dc73..4d598dc73 100644
--- a/cocoa/PSMTabBarControl/Images/pi.png
+++ b/frontends/cocoa/PSMTabBarControl/Images/pi.png
diff --git a/cocoa/PSMTabBarControl/NSBezierPath_AMShading.h b/frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.h
index fd2c2dde4..fd2c2dde4 100644
--- a/cocoa/PSMTabBarControl/NSBezierPath_AMShading.h
+++ b/frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.h
diff --git a/cocoa/PSMTabBarControl/NSBezierPath_AMShading.m b/frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.m
index 30ee24096..30ee24096 100644
--- a/cocoa/PSMTabBarControl/NSBezierPath_AMShading.m
+++ b/frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.m
diff --git a/cocoa/PSMTabBarControl/NSString_AITruncation.h b/frontends/cocoa/PSMTabBarControl/NSString_AITruncation.h
index cbcbf2c7f..cbcbf2c7f 100644
--- a/cocoa/PSMTabBarControl/NSString_AITruncation.h
+++ b/frontends/cocoa/PSMTabBarControl/NSString_AITruncation.h
diff --git a/cocoa/PSMTabBarControl/NSString_AITruncation.m b/frontends/cocoa/PSMTabBarControl/NSString_AITruncation.m
index 1a54502e5..1a54502e5 100644
--- a/cocoa/PSMTabBarControl/NSString_AITruncation.m
+++ b/frontends/cocoa/PSMTabBarControl/NSString_AITruncation.m
diff --git a/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h b/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h
index decda5be4..decda5be4 100644
--- a/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h
diff --git a/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m b/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m
index c316f6973..c316f6973 100644
--- a/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m
diff --git a/cocoa/PSMTabBarControl/PSMProgressIndicator.h b/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.h
index ffce06926..ffce06926 100644
--- a/cocoa/PSMTabBarControl/PSMProgressIndicator.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.h
diff --git a/cocoa/PSMTabBarControl/PSMProgressIndicator.m b/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.m
index 983609bbc..983609bbc 100644
--- a/cocoa/PSMTabBarControl/PSMProgressIndicator.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.m
diff --git a/cocoa/PSMTabBarControl/PSMRolloverButton.h b/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.h
index 62fce23e0..62fce23e0 100644
--- a/cocoa/PSMTabBarControl/PSMRolloverButton.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.h
diff --git a/cocoa/PSMTabBarControl/PSMRolloverButton.m b/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.m
index 8886560c7..8886560c7 100644
--- a/cocoa/PSMTabBarControl/PSMRolloverButton.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.m
diff --git a/cocoa/PSMTabBarControl/PSMTabBarCell.h b/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.h
index c8f6cecdd..c8f6cecdd 100644
--- a/cocoa/PSMTabBarControl/PSMTabBarCell.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.h
diff --git a/cocoa/PSMTabBarControl/PSMTabBarCell.m b/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.m
index f7a04f202..f7a04f202 100644
--- a/cocoa/PSMTabBarControl/PSMTabBarCell.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.m
diff --git a/cocoa/PSMTabBarControl/PSMTabBarControl.h b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.h
index 980c43d38..980c43d38 100644
--- a/cocoa/PSMTabBarControl/PSMTabBarControl.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.h
diff --git a/cocoa/PSMTabBarControl/PSMTabBarControl.m b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.m
index cb0e0342c..cb0e0342c 100644
--- a/cocoa/PSMTabBarControl/PSMTabBarControl.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.m
diff --git a/cocoa/PSMTabBarControl/PSMTabBarController.h b/frontends/cocoa/PSMTabBarControl/PSMTabBarController.h
index a73a04f1f..a73a04f1f 100644
--- a/cocoa/PSMTabBarControl/PSMTabBarController.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarController.h
diff --git a/cocoa/PSMTabBarControl/PSMTabBarController.m b/frontends/cocoa/PSMTabBarControl/PSMTabBarController.m
index 68e1bc498..68e1bc498 100644
--- a/cocoa/PSMTabBarControl/PSMTabBarController.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarController.m
diff --git a/cocoa/PSMTabBarControl/PSMTabDragAssistant.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.h
index 2632e11a0..2632e11a0 100644
--- a/cocoa/PSMTabBarControl/PSMTabDragAssistant.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.h
diff --git a/cocoa/PSMTabBarControl/PSMTabDragAssistant.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.m
index 4542e8d02..4542e8d02 100644
--- a/cocoa/PSMTabBarControl/PSMTabDragAssistant.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.m
diff --git a/cocoa/PSMTabBarControl/PSMTabDragView.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragView.h
index f8018d290..f8018d290 100644
--- a/cocoa/PSMTabBarControl/PSMTabDragView.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragView.h
diff --git a/cocoa/PSMTabBarControl/PSMTabDragView.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragView.m
index 2c9781dbc..2c9781dbc 100644
--- a/cocoa/PSMTabBarControl/PSMTabDragView.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragView.m
diff --git a/cocoa/PSMTabBarControl/PSMTabDragWindow.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.h
index 04cde248c..04cde248c 100644
--- a/cocoa/PSMTabBarControl/PSMTabDragWindow.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.h
diff --git a/cocoa/PSMTabBarControl/PSMTabDragWindow.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.m
index d6fcc95a3..d6fcc95a3 100644
--- a/cocoa/PSMTabBarControl/PSMTabDragWindow.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.m
diff --git a/cocoa/PSMTabBarControl/PSMTabDragWindowController.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.h
index 5948207f2..5948207f2 100644
--- a/cocoa/PSMTabBarControl/PSMTabDragWindowController.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.h
diff --git a/cocoa/PSMTabBarControl/PSMTabDragWindowController.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.m
index 3a6e8c663..3a6e8c663 100644
--- a/cocoa/PSMTabBarControl/PSMTabDragWindowController.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.m
diff --git a/cocoa/PSMTabBarControl/PSMTabStyle.h b/frontends/cocoa/PSMTabBarControl/PSMTabStyle.h
index ca3717435..ca3717435 100644
--- a/cocoa/PSMTabBarControl/PSMTabStyle.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabStyle.h
diff --git a/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h b/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h
index 20202536a..20202536a 100644
--- a/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h
diff --git a/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m b/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m
index 77be601be..77be601be 100644
--- a/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m
+++ b/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m
diff --git a/cocoa/PSMTabBarControl/ReadMe.rtfd/TXT.rtf b/frontends/cocoa/PSMTabBarControl/ReadMe.rtfd/TXT.rtf
index acd9372a2..acd9372a2 100644
--- a/cocoa/PSMTabBarControl/ReadMe.rtfd/TXT.rtf
+++ b/frontends/cocoa/PSMTabBarControl/ReadMe.rtfd/TXT.rtf
diff --git a/cocoa/PSMTabBarControl/ReadMe.rtfd/startpage.gif b/frontends/cocoa/PSMTabBarControl/ReadMe.rtfd/startpage.gif
index 8707a77ab..8707a77ab 100644
--- a/cocoa/PSMTabBarControl/ReadMe.rtfd/startpage.gif
+++ b/frontends/cocoa/PSMTabBarControl/ReadMe.rtfd/startpage.gif
diff --git a/cocoa/PreferencesWindowController.h b/frontends/cocoa/PreferencesWindowController.h
index 8f72907a3..8f72907a3 100644
--- a/cocoa/PreferencesWindowController.h
+++ b/frontends/cocoa/PreferencesWindowController.h
diff --git a/cocoa/PreferencesWindowController.m b/frontends/cocoa/PreferencesWindowController.m
index f314736e3..f314736e3 100644
--- a/cocoa/PreferencesWindowController.m
+++ b/frontends/cocoa/PreferencesWindowController.m
diff --git a/cocoa/Prefix.pch b/frontends/cocoa/Prefix.pch
index 7fa2c0547..7fa2c0547 100644
--- a/cocoa/Prefix.pch
+++ b/frontends/cocoa/Prefix.pch
diff --git a/cocoa/ScrollableView.h b/frontends/cocoa/ScrollableView.h
index 071a11825..071a11825 100644
--- a/cocoa/ScrollableView.h
+++ b/frontends/cocoa/ScrollableView.h
diff --git a/cocoa/ScrollableView.m b/frontends/cocoa/ScrollableView.m
index 8f27b2b56..8f27b2b56 100644
--- a/cocoa/ScrollableView.m
+++ b/frontends/cocoa/ScrollableView.m
diff --git a/cocoa/SearchWindowController.h b/frontends/cocoa/SearchWindowController.h
index 7ce8c00c9..7ce8c00c9 100644
--- a/cocoa/SearchWindowController.h
+++ b/frontends/cocoa/SearchWindowController.h
diff --git a/cocoa/SearchWindowController.m b/frontends/cocoa/SearchWindowController.m
index 1c896a958..1c896a958 100644
--- a/cocoa/SearchWindowController.m
+++ b/frontends/cocoa/SearchWindowController.m
diff --git a/cocoa/Tree.h b/frontends/cocoa/Tree.h
index 422478182..422478182 100644
--- a/cocoa/Tree.h
+++ b/frontends/cocoa/Tree.h
diff --git a/cocoa/Tree.m b/frontends/cocoa/Tree.m
index 5cd796ceb..5cd796ceb 100644
--- a/cocoa/Tree.m
+++ b/frontends/cocoa/Tree.m
diff --git a/cocoa/TreeView.h b/frontends/cocoa/TreeView.h
index 31dedbb0f..31dedbb0f 100644
--- a/cocoa/TreeView.h
+++ b/frontends/cocoa/TreeView.h
diff --git a/cocoa/TreeView.m b/frontends/cocoa/TreeView.m
index a58a49623..a58a49623 100644
--- a/cocoa/TreeView.m
+++ b/frontends/cocoa/TreeView.m
diff --git a/cocoa/URLFieldCell.h b/frontends/cocoa/URLFieldCell.h
index 38a75a139..38a75a139 100644
--- a/cocoa/URLFieldCell.h
+++ b/frontends/cocoa/URLFieldCell.h
diff --git a/cocoa/URLFieldCell.m b/frontends/cocoa/URLFieldCell.m
index 1b4344b6c..1b4344b6c 100644
--- a/cocoa/URLFieldCell.m
+++ b/frontends/cocoa/URLFieldCell.m
diff --git a/cocoa/apple_image.h b/frontends/cocoa/apple_image.h
index 11248a6fb..11248a6fb 100644
--- a/cocoa/apple_image.h
+++ b/frontends/cocoa/apple_image.h
diff --git a/cocoa/apple_image.m b/frontends/cocoa/apple_image.m
index 8261e8bc6..8261e8bc6 100644
--- a/cocoa/apple_image.m
+++ b/frontends/cocoa/apple_image.m
diff --git a/cocoa/bitmap.h b/frontends/cocoa/bitmap.h
index 1eeed1767..1eeed1767 100644
--- a/cocoa/bitmap.h
+++ b/frontends/cocoa/bitmap.h
diff --git a/cocoa/bitmap.m b/frontends/cocoa/bitmap.m
index 6e263a1ea..6e263a1ea 100644
--- a/cocoa/bitmap.m
+++ b/frontends/cocoa/bitmap.m
diff --git a/cocoa/compile-xib.sh b/frontends/cocoa/compile-xib.sh
index 576f9bfd0..576f9bfd0 100755
--- a/cocoa/compile-xib.sh
+++ b/frontends/cocoa/compile-xib.sh
diff --git a/cocoa/coordinates.h b/frontends/cocoa/coordinates.h
index a43db0b65..a43db0b65 100644
--- a/cocoa/coordinates.h
+++ b/frontends/cocoa/coordinates.h
diff --git a/cocoa/extract-strings.sh b/frontends/cocoa/extract-strings.sh
index c3f582619..c3f582619 100755
--- a/cocoa/extract-strings.sh
+++ b/frontends/cocoa/extract-strings.sh
diff --git a/cocoa/fetch.h b/frontends/cocoa/fetch.h
index 1b0991ef5..1b0991ef5 100644
--- a/cocoa/fetch.h
+++ b/frontends/cocoa/fetch.h
diff --git a/cocoa/fetch.m b/frontends/cocoa/fetch.m
index 1c36bb8a5..1c36bb8a5 100644
--- a/cocoa/fetch.m
+++ b/frontends/cocoa/fetch.m
diff --git a/cocoa/font.h b/frontends/cocoa/font.h
index cabd2b933..cabd2b933 100644
--- a/cocoa/font.h
+++ b/frontends/cocoa/font.h
diff --git a/cocoa/font.m b/frontends/cocoa/font.m
index f52ec85bc..f52ec85bc 100644
--- a/cocoa/font.m
+++ b/frontends/cocoa/font.m
diff --git a/cocoa/gui.h b/frontends/cocoa/gui.h
index b34e9b702..b34e9b702 100644
--- a/cocoa/gui.h
+++ b/frontends/cocoa/gui.h
diff --git a/cocoa/gui.m b/frontends/cocoa/gui.m
index a634f6a9e..a634f6a9e 100644
--- a/cocoa/gui.m
+++ b/frontends/cocoa/gui.m
diff --git a/cocoa/plotter.h b/frontends/cocoa/plotter.h
index 8a26e5246..8a26e5246 100644
--- a/cocoa/plotter.h
+++ b/frontends/cocoa/plotter.h
diff --git a/cocoa/plotter.m b/frontends/cocoa/plotter.m
index dbc9460c4..dbc9460c4 100644
--- a/cocoa/plotter.m
+++ b/frontends/cocoa/plotter.m
diff --git a/cocoa/res/BookmarksWindow.xib b/frontends/cocoa/res/BookmarksWindow.xib
index b038e6ca1..b038e6ca1 100644
--- a/cocoa/res/BookmarksWindow.xib
+++ b/frontends/cocoa/res/BookmarksWindow.xib
diff --git a/cocoa/res/Browser.xib b/frontends/cocoa/res/Browser.xib
index 35ff885b5..35ff885b5 100644
--- a/cocoa/res/Browser.xib
+++ b/frontends/cocoa/res/Browser.xib
diff --git a/cocoa/res/BrowserWindow.xib b/frontends/cocoa/res/BrowserWindow.xib
index 982144cb8..982144cb8 100644
--- a/cocoa/res/BrowserWindow.xib
+++ b/frontends/cocoa/res/BrowserWindow.xib
diff --git a/cocoa/res/DownloadWindow.xib b/frontends/cocoa/res/DownloadWindow.xib
index 039ff1914..039ff1914 100644
--- a/cocoa/res/DownloadWindow.xib
+++ b/frontends/cocoa/res/DownloadWindow.xib
diff --git a/cocoa/res/HistoryWindow.xib b/frontends/cocoa/res/HistoryWindow.xib
index a5ec90e1a..a5ec90e1a 100644
--- a/cocoa/res/HistoryWindow.xib
+++ b/frontends/cocoa/res/HistoryWindow.xib
diff --git a/cocoa/res/HomeTemplate.pdf b/frontends/cocoa/res/HomeTemplate.pdf
index 42b88e9eb..42b88e9eb 100644
--- a/cocoa/res/HomeTemplate.pdf
+++ b/frontends/cocoa/res/HomeTemplate.pdf
diff --git a/frontends/cocoa/res/Icons b/frontends/cocoa/res/Icons
new file mode 120000
index 000000000..187efd6f9
--- /dev/null
+++ b/frontends/cocoa/res/Icons
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/Icons/
\ No newline at end of file
diff --git a/cocoa/res/LocalHistoryPanel.xib b/frontends/cocoa/res/LocalHistoryPanel.xib
index 794d2db54..794d2db54 100644
--- a/cocoa/res/LocalHistoryPanel.xib
+++ b/frontends/cocoa/res/LocalHistoryPanel.xib
diff --git a/cocoa/res/MainMenu.xib b/frontends/cocoa/res/MainMenu.xib
index d38240bfd..d38240bfd 100644
--- a/cocoa/res/MainMenu.xib
+++ b/frontends/cocoa/res/MainMenu.xib
diff --git a/cocoa/res/NetSurf-Info.plist b/frontends/cocoa/res/NetSurf-Info.plist
index 60bf6820e..60bf6820e 100644
--- a/cocoa/res/NetSurf-Info.plist
+++ b/frontends/cocoa/res/NetSurf-Info.plist
diff --git a/cocoa/res/NetSurf.icns b/frontends/cocoa/res/NetSurf.icns
index 654942373..654942373 100644
--- a/cocoa/res/NetSurf.icns
+++ b/frontends/cocoa/res/NetSurf.icns
diff --git a/cocoa/res/PreferencesWindow.xib b/frontends/cocoa/res/PreferencesWindow.xib
index c4ea6b3b6..c4ea6b3b6 100644
--- a/cocoa/res/PreferencesWindow.xib
+++ b/frontends/cocoa/res/PreferencesWindow.xib
diff --git a/cocoa/res/SearchWindow.xib b/frontends/cocoa/res/SearchWindow.xib
index 8e9315b51..8e9315b51 100644
--- a/cocoa/res/SearchWindow.xib
+++ b/frontends/cocoa/res/SearchWindow.xib
diff --git a/frontends/cocoa/res/adblock.css b/frontends/cocoa/res/adblock.css
new file mode 120000
index 000000000..ff2485622
--- /dev/null
+++ b/frontends/cocoa/res/adblock.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/AdBlock,f79
\ No newline at end of file
diff --git a/frontends/cocoa/res/ca-bundle b/frontends/cocoa/res/ca-bundle
new file mode 120000
index 000000000..0b0e416ad
--- /dev/null
+++ b/frontends/cocoa/res/ca-bundle
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/ca-bundle
\ No newline at end of file
diff --git a/cocoa/res/de.lproj/BookmarksWindow.xib.strings b/frontends/cocoa/res/de.lproj/BookmarksWindow.xib.strings
index 5fa44a11e..5fa44a11e 100644
--- a/cocoa/res/de.lproj/BookmarksWindow.xib.strings
+++ b/frontends/cocoa/res/de.lproj/BookmarksWindow.xib.strings
diff --git a/cocoa/res/de.lproj/BrowserWindow.xib.strings b/frontends/cocoa/res/de.lproj/BrowserWindow.xib.strings
index a0c782cd6..a0c782cd6 100644
--- a/cocoa/res/de.lproj/BrowserWindow.xib.strings
+++ b/frontends/cocoa/res/de.lproj/BrowserWindow.xib.strings
diff --git a/cocoa/res/de.lproj/DownloadWindow.xib.strings b/frontends/cocoa/res/de.lproj/DownloadWindow.xib.strings
index d92040249..d92040249 100644
--- a/cocoa/res/de.lproj/DownloadWindow.xib.strings
+++ b/frontends/cocoa/res/de.lproj/DownloadWindow.xib.strings
diff --git a/cocoa/res/de.lproj/HistoryWindow.xib.strings b/frontends/cocoa/res/de.lproj/HistoryWindow.xib.strings
index c43bc418e..c43bc418e 100644
--- a/cocoa/res/de.lproj/HistoryWindow.xib.strings
+++ b/frontends/cocoa/res/de.lproj/HistoryWindow.xib.strings
diff --git a/cocoa/res/de.lproj/Localizable.strings b/frontends/cocoa/res/de.lproj/Localizable.strings
index 04180f485..04180f485 100644
--- a/cocoa/res/de.lproj/Localizable.strings
+++ b/frontends/cocoa/res/de.lproj/Localizable.strings
diff --git a/cocoa/res/de.lproj/MainMenu.xib.strings b/frontends/cocoa/res/de.lproj/MainMenu.xib.strings
index 3fc91c48c..3fc91c48c 100644
--- a/cocoa/res/de.lproj/MainMenu.xib.strings
+++ b/frontends/cocoa/res/de.lproj/MainMenu.xib.strings
diff --git a/frontends/cocoa/res/de.lproj/Messages b/frontends/cocoa/res/de.lproj/Messages
new file mode 120000
index 000000000..32530a151
--- /dev/null
+++ b/frontends/cocoa/res/de.lproj/Messages
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/de/Messages
\ No newline at end of file
diff --git a/cocoa/res/de.lproj/PreferencesWindow.xib.strings b/frontends/cocoa/res/de.lproj/PreferencesWindow.xib.strings
index fbe9762f2..fbe9762f2 100644
--- a/cocoa/res/de.lproj/PreferencesWindow.xib.strings
+++ b/frontends/cocoa/res/de.lproj/PreferencesWindow.xib.strings
diff --git a/cocoa/res/de.lproj/SearchWindow.xib.strings b/frontends/cocoa/res/de.lproj/SearchWindow.xib.strings
index 31fdea76b..31fdea76b 100644
--- a/cocoa/res/de.lproj/SearchWindow.xib.strings
+++ b/frontends/cocoa/res/de.lproj/SearchWindow.xib.strings
diff --git a/frontends/cocoa/res/default.css b/frontends/cocoa/res/default.css
new file mode 120000
index 000000000..a8579eb7c
--- /dev/null
+++ b/frontends/cocoa/res/default.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/CSS,f79
\ No newline at end of file
diff --git a/cocoa/res/en.lproj/Localizable.strings b/frontends/cocoa/res/en.lproj/Localizable.strings
index 9ac7a7b4d..9ac7a7b4d 100644
--- a/cocoa/res/en.lproj/Localizable.strings
+++ b/frontends/cocoa/res/en.lproj/Localizable.strings
diff --git a/frontends/cocoa/res/en.lproj/Messages b/frontends/cocoa/res/en.lproj/Messages
new file mode 120000
index 000000000..a26483244
--- /dev/null
+++ b/frontends/cocoa/res/en.lproj/Messages
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/en/Messages
\ No newline at end of file
diff --git a/cocoa/res/fr.lproj/Localizable.strings b/frontends/cocoa/res/fr.lproj/Localizable.strings
index 9ac7a7b4d..9ac7a7b4d 100644
--- a/cocoa/res/fr.lproj/Localizable.strings
+++ b/frontends/cocoa/res/fr.lproj/Localizable.strings
diff --git a/frontends/cocoa/res/fr.lproj/Messages b/frontends/cocoa/res/fr.lproj/Messages
new file mode 120000
index 000000000..467559b12
--- /dev/null
+++ b/frontends/cocoa/res/fr.lproj/Messages
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/fr/Messages
\ No newline at end of file
diff --git a/frontends/cocoa/res/internal.css b/frontends/cocoa/res/internal.css
new file mode 120000
index 000000000..17f9f1504
--- /dev/null
+++ b/frontends/cocoa/res/internal.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/internal.css,f79
\ No newline at end of file
diff --git a/cocoa/res/it.lproj/Localizable.strings b/frontends/cocoa/res/it.lproj/Localizable.strings
index 5927796a6..5927796a6 100644
--- a/cocoa/res/it.lproj/Localizable.strings
+++ b/frontends/cocoa/res/it.lproj/Localizable.strings
diff --git a/frontends/cocoa/res/it.lproj/Messages b/frontends/cocoa/res/it.lproj/Messages
new file mode 120000
index 000000000..00fc6d1ed
--- /dev/null
+++ b/frontends/cocoa/res/it.lproj/Messages
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/it/Messages
\ No newline at end of file
diff --git a/frontends/cocoa/res/netsurf.png b/frontends/cocoa/res/netsurf.png
new file mode 120000
index 000000000..905512c25
--- /dev/null
+++ b/frontends/cocoa/res/netsurf.png
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/netsurf.png,b60
\ No newline at end of file
diff --git a/cocoa/res/nl.lproj/Localizable.strings b/frontends/cocoa/res/nl.lproj/Localizable.strings
index 9ac7a7b4d..9ac7a7b4d 100644
--- a/cocoa/res/nl.lproj/Localizable.strings
+++ b/frontends/cocoa/res/nl.lproj/Localizable.strings
diff --git a/frontends/cocoa/res/nl.lproj/Messages b/frontends/cocoa/res/nl.lproj/Messages
new file mode 120000
index 000000000..c8a9cbe81
--- /dev/null
+++ b/frontends/cocoa/res/nl.lproj/Messages
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/nl/Messages
\ No newline at end of file
diff --git a/frontends/cocoa/res/quirks.css b/frontends/cocoa/res/quirks.css
new file mode 120000
index 000000000..88aabe48c
--- /dev/null
+++ b/frontends/cocoa/res/quirks.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/Quirks,f79
\ No newline at end of file
diff --git a/cocoa/schedule.h b/frontends/cocoa/schedule.h
index 43b2c1462..43b2c1462 100644
--- a/cocoa/schedule.h
+++ b/frontends/cocoa/schedule.h
diff --git a/cocoa/schedule.m b/frontends/cocoa/schedule.m
index f0896bd9d..f0896bd9d 100644
--- a/cocoa/schedule.m
+++ b/frontends/cocoa/schedule.m
diff --git a/cocoa/selection.h b/frontends/cocoa/selection.h
index 67331ea83..67331ea83 100644
--- a/cocoa/selection.h
+++ b/frontends/cocoa/selection.h
diff --git a/cocoa/selection.m b/frontends/cocoa/selection.m
index 808b70683..808b70683 100644
--- a/cocoa/selection.m
+++ b/frontends/cocoa/selection.m
diff --git a/framebuffer/Makefile.target b/frontends/framebuffer/Makefile
index 44fa5aa4a..15888aebc 100644
--- a/framebuffer/Makefile.target
+++ b/frontends/framebuffer/Makefile
@@ -2,16 +2,6 @@
 # Framebuffer target setup
 # ----------------------------------------------------------------------------
 
-# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
-NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG
-NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
-NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB
-NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
-NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
-NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
-NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
-NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
-
 CFLAGS += -Dnsframebuffer 
 
 #resource path
@@ -43,71 +33,52 @@ LDFLAGS += -Wl,--whole-archive
 $(eval $(call pkg_config_find_and_add,libnsfb,libnsfb))
 LDFLAGS += -Wl,--no-whole-archive
 
-$(eval $(call pkg_config_find_and_add,openssl,OpenSSL))
-
-# freemint does not support pkg-config for libcurl
-ifeq ($(HOST),mint)
-    CFLAGS += $(shell curl-config --cflags)
-    LDFLAGS += $(shell curl-config --libs)
-    LDFLAGS += -L/usr/lib/ -lz -liconv
-else
-    $(eval $(call pkg_config_find_and_add,libcurl,Curl ))
-endif
-
 # freetype is optional but does not use pkg-config
 ifeq ($(NETSURF_FB_FONTLIB),freetype)
   CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags)
   LDFLAGS += $(shell freetype-config --libs)
 endif
 
-# optional pkg configured libraries
-$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG))
-$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
-$(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,MOZJS,mozjs185,JavaScript))
-$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
-
 
 # ----------------------------------------------------------------------------
 # built-in resource setup
 # ----------------------------------------------------------------------------
 
-FB_IMAGE_left_arrow := framebuffer/res/icons/back.png
-FB_IMAGE_right_arrow := framebuffer/res/icons/forward.png
-FB_IMAGE_reload := framebuffer/res/icons/reload.png
-FB_IMAGE_stop_image := framebuffer/res/icons/stop.png
-FB_IMAGE_history_image := framebuffer/res/icons/history.png
-
-FB_IMAGE_left_arrow_g := framebuffer/res/icons/back_g.png
-FB_IMAGE_right_arrow_g := framebuffer/res/icons/forward_g.png
-FB_IMAGE_reload_g := framebuffer/res/icons/reload_g.png
-FB_IMAGE_stop_image_g := framebuffer/res/icons/stop_g.png
-FB_IMAGE_history_image_g := framebuffer/res/icons/history_g.png
-
-FB_IMAGE_scrolll := framebuffer/res/icons/scrolll.png
-FB_IMAGE_scrollr := framebuffer/res/icons/scrollr.png
-FB_IMAGE_scrollu := framebuffer/res/icons/scrollu.png
-FB_IMAGE_scrolld := framebuffer/res/icons/scrolld.png
-
-FB_IMAGE_osk_image := framebuffer/res/icons/osk.png
-
-FB_IMAGE_pointer_image := framebuffer/res/pointers/default.png
-FB_IMAGE_hand_image := framebuffer/res/pointers/point.png
-FB_IMAGE_caret_image := framebuffer/res/pointers/caret.png
-FB_IMAGE_menu_image := framebuffer/res/pointers/menu.png
-FB_IMAGE_progress_image := framebuffer/res/pointers/progress.png
-FB_IMAGE_move_image := framebuffer/res/pointers/move.png
-
-FB_IMAGE_throbber0 := framebuffer/res/throbber/throbber0.png
-FB_IMAGE_throbber1 := framebuffer/res/throbber/throbber1.png
-FB_IMAGE_throbber2 := framebuffer/res/throbber/throbber2.png
-FB_IMAGE_throbber3 := framebuffer/res/throbber/throbber3.png
-FB_IMAGE_throbber4 := framebuffer/res/throbber/throbber4.png
-FB_IMAGE_throbber5 := framebuffer/res/throbber/throbber5.png
-FB_IMAGE_throbber6 := framebuffer/res/throbber/throbber6.png
-FB_IMAGE_throbber7 := framebuffer/res/throbber/throbber7.png
-FB_IMAGE_throbber8 := framebuffer/res/throbber/throbber8.png
+FB_IMAGE_left_arrow := icons/back.png
+FB_IMAGE_right_arrow := icons/forward.png
+FB_IMAGE_reload := icons/reload.png
+FB_IMAGE_stop_image := icons/stop.png
+FB_IMAGE_history_image := icons/history.png
+
+FB_IMAGE_left_arrow_g := icons/back_g.png
+FB_IMAGE_right_arrow_g := icons/forward_g.png
+FB_IMAGE_reload_g := icons/reload_g.png
+FB_IMAGE_stop_image_g := icons/stop_g.png
+FB_IMAGE_history_image_g := icons/history_g.png
+
+FB_IMAGE_scrolll := icons/scrolll.png
+FB_IMAGE_scrollr := icons/scrollr.png
+FB_IMAGE_scrollu := icons/scrollu.png
+FB_IMAGE_scrolld := icons/scrolld.png
+
+FB_IMAGE_osk_image := icons/osk.png
+
+FB_IMAGE_pointer_image := pointers/default.png
+FB_IMAGE_hand_image := pointers/point.png
+FB_IMAGE_caret_image := pointers/caret.png
+FB_IMAGE_menu_image := pointers/menu.png
+FB_IMAGE_progress_image := pointers/progress.png
+FB_IMAGE_move_image := pointers/move.png
+
+FB_IMAGE_throbber0 := throbber/throbber0.png
+FB_IMAGE_throbber1 := throbber/throbber1.png
+FB_IMAGE_throbber2 := throbber/throbber2.png
+FB_IMAGE_throbber3 := throbber/throbber3.png
+FB_IMAGE_throbber4 := throbber/throbber4.png
+FB_IMAGE_throbber5 := throbber/throbber5.png
+FB_IMAGE_throbber6 := throbber/throbber6.png
+FB_IMAGE_throbber7 := throbber/throbber7.png
+FB_IMAGE_throbber8 := throbber/throbber8.png
 
 # local compiler flags
 ifeq ($(HOST),OpenBSD)
@@ -122,9 +93,9 @@ endif
 #
 # convert_image dependd on fb_bitmap.h so that if we change that
 # header, we get new images built.
-$(TOOLROOT)/convert_image: $(TOOLROOT)/created framebuffer/convert_image.c framebuffer/fbtk.h
+$(TOOLROOT)/convert_image: $(TOOLROOT)/created $(FRONTEND_SOURCE_DIR)/convert_image.c $(FRONTEND_SOURCE_DIR)/fbtk.h
 	$(VQ)echo " HOST CC: $@"
-	$(Q)$(HOST_CC) $(HOST_CFLAGS) -o $@ framebuffer/convert_image.c $(HOST_LDFLAGS)
+	$(Q)$(HOST_CC) $(HOST_CFLAGS) -o $@ $(FRONTEND_SOURCE_DIR)/convert_image.c $(HOST_LDFLAGS)
 
 # 1: input file
 # 2: output file
@@ -140,16 +111,16 @@ endef
 
 S_IMAGES :=
 
-$(eval $(foreach V,$(filter FB_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V)),$(OBJROOT)/image-$(patsubst FB_IMAGE_%,%,$(V)).c,$(patsubst FB_IMAGE_%,%,$(V)))))
+$(eval $(foreach V,$(filter FB_IMAGE_%,$(.VARIABLES)),$(call convert_image,$(FRONTEND_RESOURCES_DIR)/$($(V)),$(OBJROOT)/image-$(patsubst FB_IMAGE_%,%,$(V)).c,$(patsubst FB_IMAGE_%,%,$(V)))))
 
 
 # Internal fonts to generate
-FB_FONT_internal_ns-sans := framebuffer/res/fonts/glyph_data
+FB_FONT_internal_ns-sans := fonts/glyph_data
 
 # Internal font conversion
-$(TOOLROOT)/convert_font: $(TOOLROOT)/created framebuffer/convert_font.c
+$(TOOLROOT)/convert_font: $(TOOLROOT)/created $(FRONTEND_SOURCE_DIR)/convert_font.c
 	$(VQ)echo " HOST CC: $@"
-	$(Q)$(HOST_CC) -o $@ framebuffer/convert_font.c
+	$(Q)$(HOST_CC) -o $@ $(FRONTEND_SOURCE_DIR)/convert_font.c
 
 # 1: input file
 # 2: output source code file
@@ -167,27 +138,28 @@ endef
 
 S_FONTS :=
 
-$(eval $(foreach V,$(filter FB_FONT_$(NETSURF_FB_FONTLIB)_%,$(.VARIABLES)),$(call convert_font,$($(V)),$(OBJROOT)/font-$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V)).c,$(OBJROOT)/font-$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V)).h,$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V)))))
+$(eval $(foreach V,$(filter FB_FONT_$(NETSURF_FB_FONTLIB)_%,$(.VARIABLES)),$(call convert_font,$(FRONTEND_RESOURCES_DIR)/$($(V)),$(OBJROOT)/font-$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V)).c,$(OBJROOT)/font-$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V)).h,$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V)))))
 
 # ----------------------------------------------------------------------------
 # Source file setup
 # ----------------------------------------------------------------------------
 
-# S_FRAMEBUFFER are sources purely for the framebuffer build
-S_FRAMEBUFFER := gui.c framebuffer.c schedule.c bitmap.c fetch.c	\
+# S_FRONTEND are sources purely for the framebuffer build
+S_FRONTEND := gui.c framebuffer.c schedule.c bitmap.c fetch.c	\
 	findfile.c localhistory.c clipboard.c
 
+# toolkit sources
 S_FRAMEBUFFER_FBTK := fbtk.c event.c fill.c bitmap.c user.c window.c 	\
 	text.c scroll.c osk.c 
 
-S_FRAMEBUFFER += font_$(NETSURF_FB_FONTLIB).c
+S_FRONTEND += font_$(NETSURF_FB_FONTLIB).c
 
-S_FRAMEBUFFER := $(addprefix framebuffer/,$(S_FRAMEBUFFER)) $(addprefix framebuffer/fbtk/,$(S_FRAMEBUFFER_FBTK))
+S_FRONTEND += $(addprefix fbtk/,$(S_FRAMEBUFFER_FBTK))
 
 # This is the final source build list
 # Note this is deliberately *not* expanded here as common and image
 #   are not yet available
-SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRAMEBUFFER) $(S_IMAGES) $(S_FONTS)
+SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) $(S_IMAGES) $(S_FONTS)
 EXETARGET := nsfb
 
 # ----------------------------------------------------------------------------
diff --git a/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults
index 5fe8e2c40..fe54daafe 100644
--- a/framebuffer/Makefile.defaults
+++ b/frontends/framebuffer/Makefile.defaults
@@ -40,7 +40,7 @@ NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/
 NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/
 
 # Default framebuffer search path
-NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./framebuffer/res
+NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./frontends/framebuffer/res
 
 # freetype compiled in font serch path
 NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts
diff --git a/framebuffer/bitmap.c b/frontends/framebuffer/bitmap.c
index b4907ada6..b4907ada6 100644
--- a/framebuffer/bitmap.c
+++ b/frontends/framebuffer/bitmap.c
diff --git a/framebuffer/bitmap.h b/frontends/framebuffer/bitmap.h
index 0a72f19c8..0a72f19c8 100644
--- a/framebuffer/bitmap.h
+++ b/frontends/framebuffer/bitmap.h
diff --git a/framebuffer/clipboard.c b/frontends/framebuffer/clipboard.c
index 05defe8f9..05defe8f9 100644
--- a/framebuffer/clipboard.c
+++ b/frontends/framebuffer/clipboard.c
diff --git a/framebuffer/clipboard.h b/frontends/framebuffer/clipboard.h
index b5f7b0f29..b5f7b0f29 100644
--- a/framebuffer/clipboard.h
+++ b/frontends/framebuffer/clipboard.h
diff --git a/framebuffer/convert_font.c b/frontends/framebuffer/convert_font.c
index 010af857a..010af857a 100644
--- a/framebuffer/convert_font.c
+++ b/frontends/framebuffer/convert_font.c
diff --git a/framebuffer/convert_image.c b/frontends/framebuffer/convert_image.c
index 838a90703..838a90703 100644
--- a/framebuffer/convert_image.c
+++ b/frontends/framebuffer/convert_image.c
diff --git a/framebuffer/fb_search.c b/frontends/framebuffer/fb_search.c
index 19fefa8b2..19fefa8b2 100644
--- a/framebuffer/fb_search.c
+++ b/frontends/framebuffer/fb_search.c
diff --git a/framebuffer/fbtk.h b/frontends/framebuffer/fbtk.h
index 6ad06edff..6ad06edff 100644
--- a/framebuffer/fbtk.h
+++ b/frontends/framebuffer/fbtk.h
diff --git a/framebuffer/fbtk/bitmap.c b/frontends/framebuffer/fbtk/bitmap.c
index 1f147be00..1f147be00 100644
--- a/framebuffer/fbtk/bitmap.c
+++ b/frontends/framebuffer/fbtk/bitmap.c
diff --git a/framebuffer/fbtk/event.c b/frontends/framebuffer/fbtk/event.c
index c0894921e..c0894921e 100644
--- a/framebuffer/fbtk/event.c
+++ b/frontends/framebuffer/fbtk/event.c
diff --git a/framebuffer/fbtk/fbtk.c b/frontends/framebuffer/fbtk/fbtk.c
index db1c1f1a9..db1c1f1a9 100644
--- a/framebuffer/fbtk/fbtk.c
+++ b/frontends/framebuffer/fbtk/fbtk.c
diff --git a/framebuffer/fbtk/fill.c b/frontends/framebuffer/fbtk/fill.c
index 07397b2df..07397b2df 100644
--- a/framebuffer/fbtk/fill.c
+++ b/frontends/framebuffer/fbtk/fill.c
diff --git a/framebuffer/fbtk/osk.c b/frontends/framebuffer/fbtk/osk.c
index 1d57f157f..1d57f157f 100644
--- a/framebuffer/fbtk/osk.c
+++ b/frontends/framebuffer/fbtk/osk.c
diff --git a/framebuffer/fbtk/scroll.c b/frontends/framebuffer/fbtk/scroll.c
index c86c8a6de..c86c8a6de 100644
--- a/framebuffer/fbtk/scroll.c
+++ b/frontends/framebuffer/fbtk/scroll.c
diff --git a/framebuffer/fbtk/text.c b/frontends/framebuffer/fbtk/text.c
index 258e9dff9..258e9dff9 100644
--- a/framebuffer/fbtk/text.c
+++ b/frontends/framebuffer/fbtk/text.c
diff --git a/framebuffer/fbtk/user.c b/frontends/framebuffer/fbtk/user.c
index 2b9cc8768..2b9cc8768 100644
--- a/framebuffer/fbtk/user.c
+++ b/frontends/framebuffer/fbtk/user.c
diff --git a/framebuffer/fbtk/widget.h b/frontends/framebuffer/fbtk/widget.h
index 5622723ee..5622723ee 100644
--- a/framebuffer/fbtk/widget.h
+++ b/frontends/framebuffer/fbtk/widget.h
diff --git a/framebuffer/fbtk/window.c b/frontends/framebuffer/fbtk/window.c
index 787dac720..787dac720 100644
--- a/framebuffer/fbtk/window.c
+++ b/frontends/framebuffer/fbtk/window.c
diff --git a/framebuffer/fetch.c b/frontends/framebuffer/fetch.c
index 24920fbbb..24920fbbb 100644
--- a/framebuffer/fetch.c
+++ b/frontends/framebuffer/fetch.c
diff --git a/framebuffer/fetch.h b/frontends/framebuffer/fetch.h
index 718b08300..718b08300 100644
--- a/framebuffer/fetch.h
+++ b/frontends/framebuffer/fetch.h
diff --git a/framebuffer/findfile.c b/frontends/framebuffer/findfile.c
index 67312f452..67312f452 100644
--- a/framebuffer/findfile.c
+++ b/frontends/framebuffer/findfile.c
diff --git a/framebuffer/findfile.h b/frontends/framebuffer/findfile.h
index 1f3db6eb1..1f3db6eb1 100644
--- a/framebuffer/findfile.h
+++ b/frontends/framebuffer/findfile.h
diff --git a/framebuffer/font.h b/frontends/framebuffer/font.h
index 722a604e4..722a604e4 100644
--- a/framebuffer/font.h
+++ b/frontends/framebuffer/font.h
diff --git a/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index 7756ae77b..7756ae77b 100644
--- a/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
diff --git a/framebuffer/font_freetype.h b/frontends/framebuffer/font_freetype.h
index cbc6d82c8..cbc6d82c8 100644
--- a/framebuffer/font_freetype.h
+++ b/frontends/framebuffer/font_freetype.h
diff --git a/framebuffer/font_internal.c b/frontends/framebuffer/font_internal.c
index 7578e641a..7578e641a 100644
--- a/framebuffer/font_internal.c
+++ b/frontends/framebuffer/font_internal.c
diff --git a/framebuffer/font_internal.h b/frontends/framebuffer/font_internal.h
index f25df8de6..f25df8de6 100644
--- a/framebuffer/font_internal.h
+++ b/frontends/framebuffer/font_internal.h
diff --git a/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c
index 57dfecb4d..57dfecb4d 100644
--- a/framebuffer/framebuffer.c
+++ b/frontends/framebuffer/framebuffer.c
diff --git a/framebuffer/framebuffer.h b/frontends/framebuffer/framebuffer.h
index d99049f52..d99049f52 100644
--- a/framebuffer/framebuffer.h
+++ b/frontends/framebuffer/framebuffer.h
diff --git a/framebuffer/gui.c b/frontends/framebuffer/gui.c
index b0b98c546..b0b98c546 100644
--- a/framebuffer/gui.c
+++ b/frontends/framebuffer/gui.c
diff --git a/framebuffer/gui.h b/frontends/framebuffer/gui.h
index 0de1add69..0de1add69 100644
--- a/framebuffer/gui.h
+++ b/frontends/framebuffer/gui.h
diff --git a/framebuffer/image_data.h b/frontends/framebuffer/image_data.h
index cf349f59a..cf349f59a 100644
--- a/framebuffer/image_data.h
+++ b/frontends/framebuffer/image_data.h
diff --git a/framebuffer/localhistory.c b/frontends/framebuffer/localhistory.c
index 1b2eb9a60..1b2eb9a60 100644
--- a/framebuffer/localhistory.c
+++ b/frontends/framebuffer/localhistory.c
diff --git a/framebuffer/options.h b/frontends/framebuffer/options.h
index eee6f4bc6..eee6f4bc6 100644
--- a/framebuffer/options.h
+++ b/frontends/framebuffer/options.h
diff --git a/cocoa/res/en.lproj/Messages b/frontends/framebuffer/res/Messages
index 72c9eff90..72c9eff90 120000
--- a/cocoa/res/en.lproj/Messages
+++ b/frontends/framebuffer/res/Messages
diff --git a/frontends/framebuffer/res/adblock.css b/frontends/framebuffer/res/adblock.css
new file mode 120000
index 000000000..ff2485622
--- /dev/null
+++ b/frontends/framebuffer/res/adblock.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/AdBlock,f79
\ No newline at end of file
diff --git a/gtk/res/en/credits.html b/frontends/framebuffer/res/credits.html
index 1ba17392b..1ba17392b 120000
--- a/gtk/res/en/credits.html
+++ b/frontends/framebuffer/res/credits.html
diff --git a/frontends/framebuffer/res/default.css b/frontends/framebuffer/res/default.css
new file mode 120000
index 000000000..a8579eb7c
--- /dev/null
+++ b/frontends/framebuffer/res/default.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/CSS,f79
\ No newline at end of file
diff --git a/frontends/framebuffer/res/favicon.png b/frontends/framebuffer/res/favicon.png
new file mode 120000
index 000000000..5a8b3433c
--- /dev/null
+++ b/frontends/framebuffer/res/favicon.png
@@ -0,0 +1 @@
+../../../resources/favicon.png
\ No newline at end of file
diff --git a/framebuffer/res/fonts/glyph_data b/frontends/framebuffer/res/fonts/glyph_data
index e02756646..e02756646 100644
--- a/framebuffer/res/fonts/glyph_data
+++ b/frontends/framebuffer/res/fonts/glyph_data
diff --git a/framebuffer/res/icons/back.png b/frontends/framebuffer/res/icons/back.png
index 654a2928d..654a2928d 100644
--- a/framebuffer/res/icons/back.png
+++ b/frontends/framebuffer/res/icons/back.png
diff --git a/framebuffer/res/icons/back_g.png b/frontends/framebuffer/res/icons/back_g.png
index 394c1cb30..394c1cb30 100644
--- a/framebuffer/res/icons/back_g.png
+++ b/frontends/framebuffer/res/icons/back_g.png
diff --git a/framebuffer/res/icons/forward.png b/frontends/framebuffer/res/icons/forward.png
index 73929f438..73929f438 100644
--- a/framebuffer/res/icons/forward.png
+++ b/frontends/framebuffer/res/icons/forward.png
diff --git a/framebuffer/res/icons/forward_g.png b/frontends/framebuffer/res/icons/forward_g.png
index 3278f4110..3278f4110 100644
--- a/framebuffer/res/icons/forward_g.png
+++ b/frontends/framebuffer/res/icons/forward_g.png
diff --git a/framebuffer/res/icons/history.png b/frontends/framebuffer/res/icons/history.png
index b124db7bf..b124db7bf 100644
--- a/framebuffer/res/icons/history.png
+++ b/frontends/framebuffer/res/icons/history.png
diff --git a/framebuffer/res/icons/history_g.png b/frontends/framebuffer/res/icons/history_g.png
index 1597d54e7..1597d54e7 100644
--- a/framebuffer/res/icons/history_g.png
+++ b/frontends/framebuffer/res/icons/history_g.png
diff --git a/framebuffer/res/icons/home.png b/frontends/framebuffer/res/icons/home.png
index c13ba6cab..c13ba6cab 100644
--- a/framebuffer/res/icons/home.png
+++ b/frontends/framebuffer/res/icons/home.png
diff --git a/framebuffer/res/icons/home_g.png b/frontends/framebuffer/res/icons/home_g.png
index eea22a541..eea22a541 100644
--- a/framebuffer/res/icons/home_g.png
+++ b/frontends/framebuffer/res/icons/home_g.png
diff --git a/framebuffer/res/icons/osk.png b/frontends/framebuffer/res/icons/osk.png
index 1e64fed01..1e64fed01 100644
--- a/framebuffer/res/icons/osk.png
+++ b/frontends/framebuffer/res/icons/osk.png
diff --git a/framebuffer/res/icons/reload.png b/frontends/framebuffer/res/icons/reload.png
index 7609f816c..7609f816c 100644
--- a/framebuffer/res/icons/reload.png
+++ b/frontends/framebuffer/res/icons/reload.png
diff --git a/framebuffer/res/icons/reload_g.png b/frontends/framebuffer/res/icons/reload_g.png
index 65ad90402..65ad90402 100644
--- a/framebuffer/res/icons/reload_g.png
+++ b/frontends/framebuffer/res/icons/reload_g.png
diff --git a/framebuffer/res/icons/scrolld.png b/frontends/framebuffer/res/icons/scrolld.png
index 197720775..197720775 100644
--- a/framebuffer/res/icons/scrolld.png
+++ b/frontends/framebuffer/res/icons/scrolld.png
diff --git a/framebuffer/res/icons/scrolll.png b/frontends/framebuffer/res/icons/scrolll.png
index 83f8609b2..83f8609b2 100644
--- a/framebuffer/res/icons/scrolll.png
+++ b/frontends/framebuffer/res/icons/scrolll.png
diff --git a/framebuffer/res/icons/scrollr.png b/frontends/framebuffer/res/icons/scrollr.png
index 669e758ba..669e758ba 100644
--- a/framebuffer/res/icons/scrollr.png
+++ b/frontends/framebuffer/res/icons/scrollr.png
diff --git a/framebuffer/res/icons/scrollu.png b/frontends/framebuffer/res/icons/scrollu.png
index f635c2bdd..f635c2bdd 100644
--- a/framebuffer/res/icons/scrollu.png
+++ b/frontends/framebuffer/res/icons/scrollu.png
diff --git a/framebuffer/res/icons/stop.png b/frontends/framebuffer/res/icons/stop.png
index c62005134..c62005134 100644
--- a/framebuffer/res/icons/stop.png
+++ b/frontends/framebuffer/res/icons/stop.png
diff --git a/framebuffer/res/icons/stop_g.png b/frontends/framebuffer/res/icons/stop_g.png
index 5c36c7d8d..5c36c7d8d 100644
--- a/framebuffer/res/icons/stop_g.png
+++ b/frontends/framebuffer/res/icons/stop_g.png
diff --git a/frontends/framebuffer/res/internal.css b/frontends/framebuffer/res/internal.css
new file mode 120000
index 000000000..17f9f1504
--- /dev/null
+++ b/frontends/framebuffer/res/internal.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/internal.css,f79
\ No newline at end of file
diff --git a/gtk/res/en/licence.html b/frontends/framebuffer/res/licence.html
index 147dd6db2..147dd6db2 120000
--- a/gtk/res/en/licence.html
+++ b/frontends/framebuffer/res/licence.html
diff --git a/gtk/res/en/welcome.html b/frontends/framebuffer/res/maps.html
index 28362130a..28362130a 120000
--- a/gtk/res/en/welcome.html
+++ b/frontends/framebuffer/res/maps.html
diff --git a/frontends/framebuffer/res/netsurf.png b/frontends/framebuffer/res/netsurf.png
new file mode 120000
index 000000000..905512c25
--- /dev/null
+++ b/frontends/framebuffer/res/netsurf.png
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/netsurf.png,b60
\ No newline at end of file
diff --git a/framebuffer/res/pointers/caret.png b/frontends/framebuffer/res/pointers/caret.png
index dff246599..dff246599 100644
--- a/framebuffer/res/pointers/caret.png
+++ b/frontends/framebuffer/res/pointers/caret.png
diff --git a/framebuffer/res/pointers/cross.png b/frontends/framebuffer/res/pointers/cross.png
index 90464dc5f..90464dc5f 100644
--- a/framebuffer/res/pointers/cross.png
+++ b/frontends/framebuffer/res/pointers/cross.png
diff --git a/framebuffer/res/pointers/default.png b/frontends/framebuffer/res/pointers/default.png
index 479a8e854..479a8e854 100644
--- a/framebuffer/res/pointers/default.png
+++ b/frontends/framebuffer/res/pointers/default.png
diff --git a/framebuffer/res/pointers/help.png b/frontends/framebuffer/res/pointers/help.png
index 36c1a02a1..36c1a02a1 100644
--- a/framebuffer/res/pointers/help.png
+++ b/frontends/framebuffer/res/pointers/help.png
diff --git a/framebuffer/res/pointers/left-right.png b/frontends/framebuffer/res/pointers/left-right.png
index ec139caa7..ec139caa7 100644
--- a/framebuffer/res/pointers/left-right.png
+++ b/frontends/framebuffer/res/pointers/left-right.png
diff --git a/framebuffer/res/pointers/lu-rd.png b/frontends/framebuffer/res/pointers/lu-rd.png
index 0ad5dc150..0ad5dc150 100644
--- a/framebuffer/res/pointers/lu-rd.png
+++ b/frontends/framebuffer/res/pointers/lu-rd.png
diff --git a/framebuffer/res/pointers/menu.png b/frontends/framebuffer/res/pointers/menu.png
index 5c0254df7..5c0254df7 100644
--- a/framebuffer/res/pointers/menu.png
+++ b/frontends/framebuffer/res/pointers/menu.png
diff --git a/framebuffer/res/pointers/move.png b/frontends/framebuffer/res/pointers/move.png
index e467c0e2b..e467c0e2b 100644
--- a/framebuffer/res/pointers/move.png
+++ b/frontends/framebuffer/res/pointers/move.png
diff --git a/framebuffer/res/pointers/no_drop.png b/frontends/framebuffer/res/pointers/no_drop.png
index e66874456..e66874456 100644
--- a/framebuffer/res/pointers/no_drop.png
+++ b/frontends/framebuffer/res/pointers/no_drop.png
diff --git a/framebuffer/res/pointers/not_allowed.png b/frontends/framebuffer/res/pointers/not_allowed.png
index 224f4e413..224f4e413 100644
--- a/framebuffer/res/pointers/not_allowed.png
+++ b/frontends/framebuffer/res/pointers/not_allowed.png
diff --git a/framebuffer/res/pointers/point.png b/frontends/framebuffer/res/pointers/point.png
index b57244328..b57244328 100644
--- a/framebuffer/res/pointers/point.png
+++ b/frontends/framebuffer/res/pointers/point.png
diff --git a/framebuffer/res/pointers/progress.png b/frontends/framebuffer/res/pointers/progress.png
index 41cfa37e7..41cfa37e7 100644
--- a/framebuffer/res/pointers/progress.png
+++ b/frontends/framebuffer/res/pointers/progress.png
diff --git a/framebuffer/res/pointers/ru-ld.png b/frontends/framebuffer/res/pointers/ru-ld.png
index 77265fc03..77265fc03 100644
--- a/framebuffer/res/pointers/ru-ld.png
+++ b/frontends/framebuffer/res/pointers/ru-ld.png
diff --git a/framebuffer/res/pointers/up-down.png b/frontends/framebuffer/res/pointers/up-down.png
index acb840e45..acb840e45 100644
--- a/framebuffer/res/pointers/up-down.png
+++ b/frontends/framebuffer/res/pointers/up-down.png
diff --git a/framebuffer/res/pointers/wait.png b/frontends/framebuffer/res/pointers/wait.png
index 6f9a0654a..6f9a0654a 100644
--- a/framebuffer/res/pointers/wait.png
+++ b/frontends/framebuffer/res/pointers/wait.png
diff --git a/frontends/framebuffer/res/quirks.css b/frontends/framebuffer/res/quirks.css
new file mode 120000
index 000000000..88aabe48c
--- /dev/null
+++ b/frontends/framebuffer/res/quirks.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/Quirks,f79
\ No newline at end of file
diff --git a/framebuffer/res/throbber b/frontends/framebuffer/res/throbber
index ccb7ff5d8..ccb7ff5d8 120000
--- a/framebuffer/res/throbber
+++ b/frontends/framebuffer/res/throbber
diff --git a/frontends/framebuffer/res/welcome.html b/frontends/framebuffer/res/welcome.html
new file mode 120000
index 000000000..28362130a
--- /dev/null
+++ b/frontends/framebuffer/res/welcome.html
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/en/welcome.html,faf
\ No newline at end of file
diff --git a/framebuffer/schedule.c b/frontends/framebuffer/schedule.c
index 581ad72f1..581ad72f1 100644
--- a/framebuffer/schedule.c
+++ b/frontends/framebuffer/schedule.c
diff --git a/framebuffer/schedule.h b/frontends/framebuffer/schedule.h
index 4e94da68e..4e94da68e 100644
--- a/framebuffer/schedule.h
+++ b/frontends/framebuffer/schedule.h
diff --git a/gtk/Makefile.target b/frontends/gtk/Makefile
index e450135b2..7f8ffc16a 100644
--- a/gtk/Makefile.target
+++ b/frontends/gtk/Makefile
@@ -9,25 +9,9 @@
 
 # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
 NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG
-NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
-NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
-NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
-NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
-NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
-NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
-NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
 NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO
 
-# add a line similar to below for each optional lib here
-# note: webp lacks pkg-config file
-$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG))
-$(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,RSVG,librsvg-2.0,SVG))
-$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG))
-$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
-$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript))
-$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
 $(eval $(call pkg_config_find_and_add_enabled,VIDEO,gstreamer-0.10,Video))
 
 # GTK and GLIB flags to disable depricated usage
@@ -59,8 +43,6 @@ GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
 		-DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\"
 
 # non optional pkg-configed libs
-$(eval $(call pkg_config_find_and_add,openssl,OpenSSL))
-$(eval $(call pkg_config_find_and_add,libcurl,Curl ))
 $(eval $(call pkg_config_find_and_add,gtk+-$(NETSURF_GTK_MAJOR).0,GTK-$(NETSURF_GTK_MAJOR)))
 $(eval $(call pkg_config_find_and_add,gthread-2.0,GThread2))
 $(eval $(call pkg_config_find_and_add,gmodule-2.0,GModule2))
@@ -73,12 +55,15 @@ LDFLAGS += -lm
 # Target setup
 # ---------------------------------------------------------------------------
 
+# Path to GTK resources
+NSGTK_RESOURCES_DIR := $(FRONTEND_RESOURCES_DIR)
+
 # The gtk binary target
 EXETARGET := nsgtk
 
 # The filter and target for split messages
 MESSAGES_FILTER=gtk
-MESSAGES_TARGET=gtk/res
+MESSAGES_TARGET=$(NSGTK_RESOURCES_DIR)
 
 # ---------------------------------------------------------------------------
 # Windows flag setup
@@ -95,9 +80,6 @@ endif
 # builtin resource sources
 S_RESOURCE :=
 
-# Path to GTK resources
-NSGTK_RESOURCES_DIR := gtk/res
-
 # Glib prior to 2.32 does not have GResource handling.
 #
 # This uses pkg-config to check for the minimum required version for
@@ -175,20 +157,18 @@ endif
 # Source file setup
 # ----------------------------------------------------------------------------
 
-# S_GTK are sources purely for the GTK build
-S_GTK := gui.c schedule.c layout_pango.c bitmap.c plotters.c		\
+# S_FRONTEND are sources purely for the GTK frontend
+S_FRONTEND := gui.c schedule.c layout_pango.c bitmap.c plotters.c	\
 	treeview.c scaffolding.c gdk.c completion.c login.c throbber.c	\
 	selection.c history.c window.c fetch.c download.c menu.c	\
 	print.c search.c tabs.c toolbar.c gettext.c			\
 	compat.c cookies.c hotlist.c viewdata.c viewsource.c		\
 	preferences.c about.c ssl_cert.c resources.c
 
-S_GTK := $(addprefix gtk/,$(S_GTK))
-
 # This is the final source build list
 # Note this is deliberately *not* expanded here as common and image
 #   are not yet available
-SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RESOURCE) $(S_GTK)
+SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RESOURCE) $(S_FRONTEND)
 
 # ----------------------------------------------------------------------------
 # Install target
@@ -202,8 +182,8 @@ GTK_RESOURCES_LIST := \
 	arrow_down_8x32.png
 
 GTK_RESOURCES_LIST := \
-	$(addprefix gtk/res/, $(GTK_RESOURCES_LIST)) \
-	$(wildcard gtk/res/*.gtk$(NETSURF_GTK_MAJOR).ui)
+	$(addprefix $(NSGTK_RESOURCES_DIR)/, $(GTK_RESOURCES_LIST)) \
+	$(wildcard $(NSGTK_RESOURCES_DIR)/*.gtk$(NETSURF_GTK_MAJOR).ui)
 
 # translations with more than just Messages files
 GTK_TRANSLATIONS_HTML := de en fr it ja nl
@@ -212,10 +192,10 @@ install-gtk:
 	$(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
 	$(Q)install nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
 	$(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons
-	$(Q)install -m 0644 gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons
+	$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons
 	$(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
-	$(Q)install -m 0644 gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber
-	$(Q)tar -c -h -C gtk/res -f - $(GTK_TRANSLATIONS_HTML) | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f -
+	$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber
+	$(Q)tar -c -h -C $(NSGTK_RESOURCES_DIR) -f - $(GTK_TRANSLATIONS_HTML) | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f -
 	$(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(DESTDIR)$(NETSURF_GTK_RESOURCES)
 
 # ----------------------------------------------------------------------------
diff --git a/gtk/Makefile.defaults b/frontends/gtk/Makefile.defaults
index d97bc2323..fc352a020 100644
--- a/gtk/Makefile.defaults
+++ b/frontends/gtk/Makefile.defaults
@@ -4,7 +4,7 @@
 
 # Where to search for NetSurf's resources after looking in ~/.netsurf and
 # $NETSURFRES.  It must have a trailing /
-NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/:./gtk/res/
+NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/:./frontends/gtk/res/
 
 # Where to install the netsurf binary
 NETSURF_GTK_BIN := $(PREFIX)/bin/
diff --git a/gtk/about.c b/frontends/gtk/about.c
index d57afea7f..d57afea7f 100644
--- a/gtk/about.c
+++ b/frontends/gtk/about.c
diff --git a/gtk/about.h b/frontends/gtk/about.h
index bf3c9f58d..bf3c9f58d 100644
--- a/gtk/about.h
+++ b/frontends/gtk/about.h
diff --git a/gtk/bitmap.c b/frontends/gtk/bitmap.c
index f8dcf1d17..f8dcf1d17 100644
--- a/gtk/bitmap.c
+++ b/frontends/gtk/bitmap.c
diff --git a/gtk/bitmap.h b/frontends/gtk/bitmap.h
index 0f46d19a8..0f46d19a8 100644
--- a/gtk/bitmap.h
+++ b/frontends/gtk/bitmap.h
diff --git a/gtk/compat.c b/frontends/gtk/compat.c
index 4c5524b0e..4c5524b0e 100644
--- a/gtk/compat.c
+++ b/frontends/gtk/compat.c
diff --git a/gtk/compat.h b/frontends/gtk/compat.h
index 9554b0cba..9554b0cba 100644
--- a/gtk/compat.h
+++ b/frontends/gtk/compat.h
diff --git a/gtk/completion.c b/frontends/gtk/completion.c
index 6dde728b3..6dde728b3 100644
--- a/gtk/completion.c
+++ b/frontends/gtk/completion.c
diff --git a/gtk/completion.h b/frontends/gtk/completion.h
index 9a1db293d..9a1db293d 100644
--- a/gtk/completion.h
+++ b/frontends/gtk/completion.h
diff --git a/gtk/cookies.c b/frontends/gtk/cookies.c
index f8f989347..f8f989347 100644
--- a/gtk/cookies.c
+++ b/frontends/gtk/cookies.c
diff --git a/gtk/cookies.h b/frontends/gtk/cookies.h
index 2d5c56d52..2d5c56d52 100644
--- a/gtk/cookies.h
+++ b/frontends/gtk/cookies.h
diff --git a/gtk/download.c b/frontends/gtk/download.c
index b7eea2584..b7eea2584 100644
--- a/gtk/download.c
+++ b/frontends/gtk/download.c
diff --git a/gtk/download.h b/frontends/gtk/download.h
index 0b1097655..0b1097655 100644
--- a/gtk/download.h
+++ b/frontends/gtk/download.h
diff --git a/gtk/fetch.c b/frontends/gtk/fetch.c
index 06770b6b2..06770b6b2 100644
--- a/gtk/fetch.c
+++ b/frontends/gtk/fetch.c
diff --git a/gtk/fetch.h b/frontends/gtk/fetch.h
index a095adbf9..a095adbf9 100644
--- a/gtk/fetch.h
+++ b/frontends/gtk/fetch.h
diff --git a/gtk/gdk.c b/frontends/gtk/gdk.c
index 9ed90bd8e..9ed90bd8e 100644
--- a/gtk/gdk.c
+++ b/frontends/gtk/gdk.c
diff --git a/gtk/gdk.h b/frontends/gtk/gdk.h
index 2fcee07f1..2fcee07f1 100644
--- a/gtk/gdk.h
+++ b/frontends/gtk/gdk.h
diff --git a/gtk/gettext.c b/frontends/gtk/gettext.c
index a9f6f48be..a9f6f48be 100644
--- a/gtk/gettext.c
+++ b/frontends/gtk/gettext.c
diff --git a/gtk/gettext.h b/frontends/gtk/gettext.h
index 726ba356e..726ba356e 100644
--- a/gtk/gettext.h
+++ b/frontends/gtk/gettext.h
diff --git a/gtk/gui.c b/frontends/gtk/gui.c
index e705918bc..e705918bc 100644
--- a/gtk/gui.c
+++ b/frontends/gtk/gui.c
diff --git a/gtk/gui.h b/frontends/gtk/gui.h
index b6a6dc994..b6a6dc994 100644
--- a/gtk/gui.h
+++ b/frontends/gtk/gui.h
diff --git a/gtk/history.c b/frontends/gtk/history.c
index 9c5c0b5e4..9c5c0b5e4 100644
--- a/gtk/history.c
+++ b/frontends/gtk/history.c
diff --git a/gtk/history.h b/frontends/gtk/history.h
index c0f7db2bd..c0f7db2bd 100644
--- a/gtk/history.h
+++ b/frontends/gtk/history.h
diff --git a/gtk/hotlist.c b/frontends/gtk/hotlist.c
index 06fd5cd69..06fd5cd69 100644
--- a/gtk/hotlist.c
+++ b/frontends/gtk/hotlist.c
diff --git a/gtk/hotlist.h b/frontends/gtk/hotlist.h
index 01e5a86c5..01e5a86c5 100644
--- a/gtk/hotlist.h
+++ b/frontends/gtk/hotlist.h
diff --git a/gtk/layout_pango.c b/frontends/gtk/layout_pango.c
index 49b629399..49b629399 100644
--- a/gtk/layout_pango.c
+++ b/frontends/gtk/layout_pango.c
diff --git a/gtk/layout_pango.h b/frontends/gtk/layout_pango.h
index 137cebe68..137cebe68 100644
--- a/gtk/layout_pango.h
+++ b/frontends/gtk/layout_pango.h
diff --git a/gtk/login.c b/frontends/gtk/login.c
index ee77052d7..ee77052d7 100644
--- a/gtk/login.c
+++ b/frontends/gtk/login.c
diff --git a/gtk/login.h b/frontends/gtk/login.h
index 00c29000c..00c29000c 100644
--- a/gtk/login.h
+++ b/frontends/gtk/login.h
diff --git a/gtk/menu.c b/frontends/gtk/menu.c
index a93ef9385..a93ef9385 100644
--- a/gtk/menu.c
+++ b/frontends/gtk/menu.c
diff --git a/gtk/menu.h b/frontends/gtk/menu.h
index 5da5cb1b2..5da5cb1b2 100644
--- a/gtk/menu.h
+++ b/frontends/gtk/menu.h
diff --git a/gtk/options.h b/frontends/gtk/options.h
index ac642c153..ac642c153 100644
--- a/gtk/options.h
+++ b/frontends/gtk/options.h
diff --git a/gtk/plotters.c b/frontends/gtk/plotters.c
index 1d8c19827..1d8c19827 100644
--- a/gtk/plotters.c
+++ b/frontends/gtk/plotters.c
diff --git a/gtk/plotters.h b/frontends/gtk/plotters.h
index c88a8da0c..c88a8da0c 100644
--- a/gtk/plotters.h
+++ b/frontends/gtk/plotters.h
diff --git a/gtk/preferences.c b/frontends/gtk/preferences.c
index 3efb9eddd..3efb9eddd 100644
--- a/gtk/preferences.c
+++ b/frontends/gtk/preferences.c
diff --git a/gtk/preferences.h b/frontends/gtk/preferences.h
index 9fe469e24..9fe469e24 100644
--- a/gtk/preferences.h
+++ b/frontends/gtk/preferences.h
diff --git a/gtk/print.c b/frontends/gtk/print.c
index a6e639996..a6e639996 100644
--- a/gtk/print.c
+++ b/frontends/gtk/print.c
diff --git a/gtk/print.h b/frontends/gtk/print.h
index d44fad31f..d44fad31f 100644
--- a/gtk/print.h
+++ b/frontends/gtk/print.h
diff --git a/gtk/res/Messages b/frontends/gtk/res/Messages
index 75bfdf53d..75bfdf53d 120000
--- a/gtk/res/Messages
+++ b/frontends/gtk/res/Messages
diff --git a/frontends/gtk/res/SearchEngines b/frontends/gtk/res/SearchEngines
new file mode 120000
index 000000000..3dc819c2a
--- /dev/null
+++ b/frontends/gtk/res/SearchEngines
@@ -0,0 +1 @@
+../../../resources/SearchEngines
\ No newline at end of file
diff --git a/frontends/gtk/res/adblock.css b/frontends/gtk/res/adblock.css
new file mode 120000
index 000000000..ff2485622
--- /dev/null
+++ b/frontends/gtk/res/adblock.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/AdBlock,f79
\ No newline at end of file
diff --git a/gtk/res/arrow_down_8x32.png b/frontends/gtk/res/arrow_down_8x32.png
index 475b4ff61..475b4ff61 100644
--- a/gtk/res/arrow_down_8x32.png
+++ b/frontends/gtk/res/arrow_down_8x32.png
diff --git a/frontends/gtk/res/ca-bundle.txt b/frontends/gtk/res/ca-bundle.txt
new file mode 120000
index 000000000..0b0e416ad
--- /dev/null
+++ b/frontends/gtk/res/ca-bundle.txt
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/ca-bundle
\ No newline at end of file
diff --git a/gtk/res/cookies.gtk2.ui b/frontends/gtk/res/cookies.gtk2.ui
index 86f15c765..86f15c765 100644
--- a/gtk/res/cookies.gtk2.ui
+++ b/frontends/gtk/res/cookies.gtk2.ui
diff --git a/gtk/res/cookies.gtk3.ui b/frontends/gtk/res/cookies.gtk3.ui
index 44dcb80b8..44dcb80b8 100644
--- a/gtk/res/cookies.gtk3.ui
+++ b/frontends/gtk/res/cookies.gtk3.ui
diff --git a/gtk/res/credits.html b/frontends/gtk/res/credits.html
index ca85d3d27..ca85d3d27 120000
--- a/gtk/res/credits.html
+++ b/frontends/gtk/res/credits.html
diff --git a/frontends/gtk/res/de/welcome.html b/frontends/gtk/res/de/welcome.html
new file mode 120000
index 000000000..98a53b215
--- /dev/null
+++ b/frontends/gtk/res/de/welcome.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/de/welcome.html,faf
\ No newline at end of file
diff --git a/frontends/gtk/res/default.css b/frontends/gtk/res/default.css
new file mode 120000
index 000000000..a8579eb7c
--- /dev/null
+++ b/frontends/gtk/res/default.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/CSS,f79
\ No newline at end of file
diff --git a/gtk/res/default.ico b/frontends/gtk/res/default.ico
index 1cb432828..1cb432828 100644
--- a/gtk/res/default.ico
+++ b/frontends/gtk/res/default.ico
diff --git a/gtk/res/downloads.gtk2.ui b/frontends/gtk/res/downloads.gtk2.ui
index 1e71328a4..1e71328a4 100644
--- a/gtk/res/downloads.gtk2.ui
+++ b/frontends/gtk/res/downloads.gtk2.ui
diff --git a/gtk/res/downloads.gtk3.ui b/frontends/gtk/res/downloads.gtk3.ui
index 1e71328a4..1e71328a4 100644
--- a/gtk/res/downloads.gtk3.ui
+++ b/frontends/gtk/res/downloads.gtk3.ui
diff --git a/frontends/gtk/res/en/credits.html b/frontends/gtk/res/en/credits.html
new file mode 120000
index 000000000..252516fd7
--- /dev/null
+++ b/frontends/gtk/res/en/credits.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/en/credits.html,faf
\ No newline at end of file
diff --git a/frontends/gtk/res/en/licence.html b/frontends/gtk/res/en/licence.html
new file mode 120000
index 000000000..79f73669b
--- /dev/null
+++ b/frontends/gtk/res/en/licence.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/en/licence.html,faf
\ No newline at end of file
diff --git a/frontends/gtk/res/en/maps.html b/frontends/gtk/res/en/maps.html
new file mode 120000
index 000000000..bb3ffcbe7
--- /dev/null
+++ b/frontends/gtk/res/en/maps.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/en/maps.html,faf
\ No newline at end of file
diff --git a/frontends/gtk/res/en/welcome.html b/frontends/gtk/res/en/welcome.html
new file mode 120000
index 000000000..601099223
--- /dev/null
+++ b/frontends/gtk/res/en/welcome.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/en/welcome.html,faf
\ No newline at end of file
diff --git a/frontends/gtk/res/favicon.png b/frontends/gtk/res/favicon.png
new file mode 120000
index 000000000..5a8b3433c
--- /dev/null
+++ b/frontends/gtk/res/favicon.png
@@ -0,0 +1 @@
+../../../resources/favicon.png
\ No newline at end of file
diff --git a/gtk/res/history.gtk2.ui b/frontends/gtk/res/history.gtk2.ui
index 2b89ecb4b..2b89ecb4b 100644
--- a/gtk/res/history.gtk2.ui
+++ b/frontends/gtk/res/history.gtk2.ui
diff --git a/gtk/res/history.gtk3.ui b/frontends/gtk/res/history.gtk3.ui
index 7fa598f1e..7fa598f1e 100644
--- a/gtk/res/history.gtk3.ui
+++ b/frontends/gtk/res/history.gtk3.ui
diff --git a/gtk/res/hotlist.gtk2.ui b/frontends/gtk/res/hotlist.gtk2.ui
index af0fd5696..af0fd5696 100644
--- a/gtk/res/hotlist.gtk2.ui
+++ b/frontends/gtk/res/hotlist.gtk2.ui
diff --git a/gtk/res/hotlist.gtk3.ui b/frontends/gtk/res/hotlist.gtk3.ui
index b0e075c4b..b0e075c4b 100644
--- a/gtk/res/hotlist.gtk3.ui
+++ b/frontends/gtk/res/hotlist.gtk3.ui
diff --git a/frontends/gtk/res/icons b/frontends/gtk/res/icons
new file mode 120000
index 000000000..187efd6f9
--- /dev/null
+++ b/frontends/gtk/res/icons
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/Icons/
\ No newline at end of file
diff --git a/frontends/gtk/res/internal.css b/frontends/gtk/res/internal.css
new file mode 120000
index 000000000..17f9f1504
--- /dev/null
+++ b/frontends/gtk/res/internal.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/internal.css,f79
\ No newline at end of file
diff --git a/frontends/gtk/res/it/credits.html b/frontends/gtk/res/it/credits.html
new file mode 120000
index 000000000..64b78982e
--- /dev/null
+++ b/frontends/gtk/res/it/credits.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/it/credits.html,faf
\ No newline at end of file
diff --git a/frontends/gtk/res/it/licence.html b/frontends/gtk/res/it/licence.html
new file mode 120000
index 000000000..4abc825d3
--- /dev/null
+++ b/frontends/gtk/res/it/licence.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/it/licence.html,faf
\ No newline at end of file
diff --git a/frontends/gtk/res/it/welcome.html b/frontends/gtk/res/it/welcome.html
new file mode 120000
index 000000000..59cef0551
--- /dev/null
+++ b/frontends/gtk/res/it/welcome.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/it/welcome.html,faf
\ No newline at end of file
diff --git a/frontends/gtk/res/ja/welcome.html b/frontends/gtk/res/ja/welcome.html
new file mode 120000
index 000000000..a2556ee4e
--- /dev/null
+++ b/frontends/gtk/res/ja/welcome.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/ja/welcome.html,faf
\ No newline at end of file
diff --git a/gtk/res/languages b/frontends/gtk/res/languages
index 4927e03a0..4927e03a0 100644
--- a/gtk/res/languages
+++ b/frontends/gtk/res/languages
diff --git a/gtk/res/licence.html b/frontends/gtk/res/licence.html
index 86f8c54bf..86f8c54bf 120000
--- a/gtk/res/licence.html
+++ b/frontends/gtk/res/licence.html
diff --git a/gtk/res/login.gtk2.ui b/frontends/gtk/res/login.gtk2.ui
index 552b173ed..552b173ed 100644
--- a/gtk/res/login.gtk2.ui
+++ b/frontends/gtk/res/login.gtk2.ui
diff --git a/gtk/res/login.gtk3.ui b/frontends/gtk/res/login.gtk3.ui
index 552b173ed..552b173ed 100644
--- a/gtk/res/login.gtk3.ui
+++ b/frontends/gtk/res/login.gtk3.ui
diff --git a/gtk/res/maps.html b/frontends/gtk/res/maps.html
index a32f725fb..a32f725fb 120000
--- a/gtk/res/maps.html
+++ b/frontends/gtk/res/maps.html
diff --git a/gtk/res/menu_cursor.png b/frontends/gtk/res/menu_cursor.png
index ccbbbd2d4..ccbbbd2d4 100644
--- a/gtk/res/menu_cursor.png
+++ b/frontends/gtk/res/menu_cursor.png
diff --git a/gtk/res/menu_cursor.xbm b/frontends/gtk/res/menu_cursor.xbm
index 1257ac1f4..1257ac1f4 100644
--- a/gtk/res/menu_cursor.xbm
+++ b/frontends/gtk/res/menu_cursor.xbm
diff --git a/gtk/res/menu_cursor_mask.xbm b/frontends/gtk/res/menu_cursor_mask.xbm
index 09789d51b..09789d51b 100644
--- a/gtk/res/menu_cursor_mask.xbm
+++ b/frontends/gtk/res/menu_cursor_mask.xbm
diff --git a/gtk/res/menu_cursor_mask.xpm b/frontends/gtk/res/menu_cursor_mask.xpm
index 985d46cc6..985d46cc6 100644
--- a/gtk/res/menu_cursor_mask.xpm
+++ b/frontends/gtk/res/menu_cursor_mask.xpm
diff --git a/gtk/res/messages.gresource.xml b/frontends/gtk/res/messages.gresource.xml
index 684a10862..684a10862 100644
--- a/gtk/res/messages.gresource.xml
+++ b/frontends/gtk/res/messages.gresource.xml
diff --git a/gtk/res/netsurf-16x16.xpm b/frontends/gtk/res/netsurf-16x16.xpm
index 7880f7aae..7880f7aae 100644
--- a/gtk/res/netsurf-16x16.xpm
+++ b/frontends/gtk/res/netsurf-16x16.xpm
diff --git a/gtk/res/netsurf-gtk.desktop b/frontends/gtk/res/netsurf-gtk.desktop
index 4c21d5537..4c21d5537 100644
--- a/gtk/res/netsurf-gtk.desktop
+++ b/frontends/gtk/res/netsurf-gtk.desktop
diff --git a/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml
index c7626b053..c7626b053 100644
--- a/gtk/res/netsurf.gresource.xml
+++ b/frontends/gtk/res/netsurf.gresource.xml
diff --git a/gtk/res/netsurf.gtk2.ui b/frontends/gtk/res/netsurf.gtk2.ui
index 68812b364..68812b364 100644
--- a/gtk/res/netsurf.gtk2.ui
+++ b/frontends/gtk/res/netsurf.gtk2.ui
diff --git a/gtk/res/netsurf.gtk3.ui b/frontends/gtk/res/netsurf.gtk3.ui
index ce47c6370..ce47c6370 100644
--- a/gtk/res/netsurf.gtk3.ui
+++ b/frontends/gtk/res/netsurf.gtk3.ui
diff --git a/frontends/gtk/res/netsurf.png b/frontends/gtk/res/netsurf.png
new file mode 120000
index 000000000..905512c25
--- /dev/null
+++ b/frontends/gtk/res/netsurf.png
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/netsurf.png,b60
\ No newline at end of file
diff --git a/gtk/res/netsurf.xpm b/frontends/gtk/res/netsurf.xpm
index 7061727d6..7061727d6 100644
--- a/gtk/res/netsurf.xpm
+++ b/frontends/gtk/res/netsurf.xpm
diff --git a/frontends/gtk/res/nl/credits.html b/frontends/gtk/res/nl/credits.html
new file mode 120000
index 000000000..9c983987a
--- /dev/null
+++ b/frontends/gtk/res/nl/credits.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/nl/credits.html,faf
\ No newline at end of file
diff --git a/frontends/gtk/res/nl/licence.html b/frontends/gtk/res/nl/licence.html
new file mode 120000
index 000000000..8a10d2073
--- /dev/null
+++ b/frontends/gtk/res/nl/licence.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/nl/licence.html,faf
\ No newline at end of file
diff --git a/frontends/gtk/res/nl/welcome.html b/frontends/gtk/res/nl/welcome.html
new file mode 120000
index 000000000..6b2ba7742
--- /dev/null
+++ b/frontends/gtk/res/nl/welcome.html
@@ -0,0 +1 @@
+../../../../!NetSurf/Resources/nl/welcome.html,faf
\ No newline at end of file
diff --git a/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui
index d5542ba5d..d5542ba5d 100644
--- a/gtk/res/options.gtk2.ui
+++ b/frontends/gtk/res/options.gtk2.ui
diff --git a/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui
index 2a3516f09..2a3516f09 100644
--- a/gtk/res/options.gtk3.ui
+++ b/frontends/gtk/res/options.gtk3.ui
diff --git a/gtk/res/password.gtk2.ui b/frontends/gtk/res/password.gtk2.ui
index eb51e4f8f..eb51e4f8f 100644
--- a/gtk/res/password.gtk2.ui
+++ b/frontends/gtk/res/password.gtk2.ui
diff --git a/gtk/res/password.gtk3.ui b/frontends/gtk/res/password.gtk3.ui
index eb51e4f8f..eb51e4f8f 100644
--- a/gtk/res/password.gtk3.ui
+++ b/frontends/gtk/res/password.gtk3.ui
diff --git a/frontends/gtk/res/quirks.css b/frontends/gtk/res/quirks.css
new file mode 120000
index 000000000..88aabe48c
--- /dev/null
+++ b/frontends/gtk/res/quirks.css
@@ -0,0 +1 @@
+../../../!NetSurf/Resources/Quirks,f79
\ No newline at end of file
diff --git a/gtk/res/ssl.gtk2.ui b/frontends/gtk/res/ssl.gtk2.ui
index 90f449ddd..90f449ddd 100644
--- a/gtk/res/ssl.gtk2.ui
+++ b/frontends/gtk/res/ssl.gtk2.ui
diff --git a/gtk/res/ssl.gtk3.ui b/frontends/gtk/res/ssl.gtk3.ui
index dace2a49e..dace2a49e 100644
--- a/gtk/res/ssl.gtk3.ui
+++ b/frontends/gtk/res/ssl.gtk3.ui
diff --git a/gtk/res/tabcontents.gtk2.ui b/frontends/gtk/res/tabcontents.gtk2.ui
index 63e290e8b..63e290e8b 100644
--- a/gtk/res/tabcontents.gtk2.ui
+++ b/frontends/gtk/res/tabcontents.gtk2.ui
diff --git a/gtk/res/tabcontents.gtk3.ui b/frontends/gtk/res/tabcontents.gtk3.ui
index 23328b3b7..23328b3b7 100644
--- a/gtk/res/tabcontents.gtk3.ui
+++ b/frontends/gtk/res/tabcontents.gtk3.ui
diff --git a/gtk/res/throbber/throbber0.png b/frontends/gtk/res/throbber/throbber0.png
index bfcb5d37f..bfcb5d37f 100644
--- a/gtk/res/throbber/throbber0.png
+++ b/frontends/gtk/res/throbber/throbber0.png
diff --git a/gtk/res/throbber/throbber1.png b/frontends/gtk/res/throbber/throbber1.png
index a44b70d64..a44b70d64 100644
--- a/gtk/res/throbber/throbber1.png
+++ b/frontends/gtk/res/throbber/throbber1.png
diff --git a/gtk/res/throbber/throbber2.png b/frontends/gtk/res/throbber/throbber2.png
index 1bbdd8b4d..1bbdd8b4d 100644
--- a/gtk/res/throbber/throbber2.png
+++ b/frontends/gtk/res/throbber/throbber2.png
diff --git a/gtk/res/throbber/throbber3.png b/frontends/gtk/res/throbber/throbber3.png
index a62488ab8..a62488ab8 100644
--- a/gtk/res/throbber/throbber3.png
+++ b/frontends/gtk/res/throbber/throbber3.png
diff --git a/gtk/res/throbber/throbber4.png b/frontends/gtk/res/throbber/throbber4.png
index 4e685dcfb..4e685dcfb 100644
--- a/gtk/res/throbber/throbber4.png
+++ b/frontends/gtk/res/throbber/throbber4.png
diff --git a/gtk/res/throbber/throbber5.png b/frontends/gtk/res/throbber/throbber5.png
index 72adf67d9..72adf67d9 100644
--- a/gtk/res/throbber/throbber5.png
+++ b/frontends/gtk/res/throbber/throbber5.png
diff --git a/gtk/res/throbber/throbber6.png b/frontends/gtk/res/throbber/throbber6.png
index f7dcc2c0c..f7dcc2c0c 100644
--- a/gtk/res/throbber/throbber6.png
+++ b/frontends/gtk/res/throbber/throbber6.png
diff --git a/gtk/res/throbber/throbber7.png b/frontends/gtk/res/throbber/throbber7.png
index da9d8aee3..da9d8aee3 100644
--- a/gtk/res/throbber/throbber7.png
+++ b/frontends/gtk/res/throbber/throbber7.png
diff --git a/gtk/res/throbber/throbber8.png b/frontends/gtk/res/throbber/throbber8.png
index 8505d1030..8505d1030 100644
--- a/gtk/res/throbber/throbber8.png
+++ b/frontends/gtk/res/throbber/throbber8.png
diff --git a/gtk/res/toolbar.gtk2.ui b/frontends/gtk/res/toolbar.gtk2.ui
index d84db5c8c..d84db5c8c 100644
--- a/gtk/res/toolbar.gtk2.ui
+++ b/frontends/gtk/res/toolbar.gtk2.ui
diff --git a/gtk/res/toolbar.gtk3.ui b/frontends/gtk/res/toolbar.gtk3.ui
index d84db5c8c..d84db5c8c 100644
--- a/gtk/res/toolbar.gtk3.ui
+++ b/frontends/gtk/res/toolbar.gtk3.ui
diff --git a/gtk/res/viewdata.gtk2.ui b/frontends/gtk/res/viewdata.gtk2.ui
index 7589022ca..7589022ca 100644
--- a/gtk/res/viewdata.gtk2.ui
+++ b/frontends/gtk/res/viewdata.gtk2.ui
diff --git a/gtk/res/viewdata.gtk3.ui b/frontends/gtk/res/viewdata.gtk3.ui
index b742d5f6b..b742d5f6b 100644
--- a/gtk/res/viewdata.gtk3.ui
+++ b/frontends/gtk/res/viewdata.gtk3.ui
diff --git a/gtk/res/warning.gtk2.ui b/frontends/gtk/res/warning.gtk2.ui
index e4fb4e662..e4fb4e662 100644
--- a/gtk/res/warning.gtk2.ui
+++ b/frontends/gtk/res/warning.gtk2.ui
diff --git a/gtk/res/warning.gtk3.ui b/frontends/gtk/res/warning.gtk3.ui
index e4fb4e662..e4fb4e662 100644
--- a/gtk/res/warning.gtk3.ui
+++ b/frontends/gtk/res/warning.gtk3.ui
diff --git a/gtk/res/welcome.html b/frontends/gtk/res/welcome.html
index 1abdc5e8a..1abdc5e8a 120000
--- a/gtk/res/welcome.html
+++ b/frontends/gtk/res/welcome.html
diff --git a/gtk/resources.c b/frontends/gtk/resources.c
index dfe3d3dad..dfe3d3dad 100644
--- a/gtk/resources.c
+++ b/frontends/gtk/resources.c
diff --git a/gtk/resources.h b/frontends/gtk/resources.h
index 923031af4..923031af4 100644
--- a/gtk/resources.h
+++ b/frontends/gtk/resources.h
diff --git a/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index 777256703..777256703 100644
--- a/gtk/scaffolding.c
+++ b/frontends/gtk/scaffolding.c
diff --git a/gtk/scaffolding.h b/frontends/gtk/scaffolding.h
index e1fd9bf2a..e1fd9bf2a 100644
--- a/gtk/scaffolding.h
+++ b/frontends/gtk/scaffolding.h
diff --git a/gtk/schedule.c b/frontends/gtk/schedule.c
index cf0333388..cf0333388 100644
--- a/gtk/schedule.c
+++ b/frontends/gtk/schedule.c
diff --git a/gtk/schedule.h b/frontends/gtk/schedule.h
index 0a2d724d4..0a2d724d4 100644
--- a/gtk/schedule.h
+++ b/frontends/gtk/schedule.h
diff --git a/gtk/search.c b/frontends/gtk/search.c
index d2adcf1b5..d2adcf1b5 100644
--- a/gtk/search.c
+++ b/frontends/gtk/search.c
diff --git a/gtk/search.h b/frontends/gtk/search.h
index dd8c60d0f..dd8c60d0f 100644
--- a/gtk/search.h
+++ b/frontends/gtk/search.h
diff --git a/gtk/selection.c b/frontends/gtk/selection.c
index d1388ed27..d1388ed27 100644
--- a/gtk/selection.c
+++ b/frontends/gtk/selection.c
diff --git a/gtk/selection.h b/frontends/gtk/selection.h
index 6463692cf..6463692cf 100644
--- a/gtk/selection.h
+++ b/frontends/gtk/selection.h
diff --git a/gtk/sexy_icon_entry.c b/frontends/gtk/sexy_icon_entry.c
index fff650cc4..fff650cc4 100644
--- a/gtk/sexy_icon_entry.c
+++ b/frontends/gtk/sexy_icon_entry.c
diff --git a/gtk/sexy_icon_entry.h b/frontends/gtk/sexy_icon_entry.h
index bd7fb3eb9..bd7fb3eb9 100644
--- a/gtk/sexy_icon_entry.h
+++ b/frontends/gtk/sexy_icon_entry.h
diff --git a/gtk/ssl_cert.c b/frontends/gtk/ssl_cert.c
index 742029f83..742029f83 100644
--- a/gtk/ssl_cert.c
+++ b/frontends/gtk/ssl_cert.c
diff --git a/gtk/ssl_cert.h b/frontends/gtk/ssl_cert.h
index 48937d457..48937d457 100644
--- a/gtk/ssl_cert.h
+++ b/frontends/gtk/ssl_cert.h
diff --git a/gtk/tabs.c b/frontends/gtk/tabs.c
index 67a410d20..67a410d20 100644
--- a/gtk/tabs.c
+++ b/frontends/gtk/tabs.c
diff --git a/gtk/tabs.h b/frontends/gtk/tabs.h
index 440d61336..440d61336 100644
--- a/gtk/tabs.h
+++ b/frontends/gtk/tabs.h
diff --git a/gtk/throbber.c b/frontends/gtk/throbber.c
index 9392c3909..9392c3909 100644
--- a/gtk/throbber.c
+++ b/frontends/gtk/throbber.c
diff --git a/gtk/throbber.h b/frontends/gtk/throbber.h
index e0b47e15c..e0b47e15c 100644
--- a/gtk/throbber.h
+++ b/frontends/gtk/throbber.h
diff --git a/gtk/toolbar.c b/frontends/gtk/toolbar.c
index 208b5c0b9..208b5c0b9 100644
--- a/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
diff --git a/gtk/toolbar.h b/frontends/gtk/toolbar.h
index 0453109ca..0453109ca 100644
--- a/gtk/toolbar.h
+++ b/frontends/gtk/toolbar.h
diff --git a/gtk/treeview.c b/frontends/gtk/treeview.c
index 9baf57b62..9baf57b62 100644
--- a/gtk/treeview.c
+++ b/frontends/gtk/treeview.c
diff --git a/gtk/treeview.h b/frontends/gtk/treeview.h
index ad8180f33..ad8180f33 100644
--- a/gtk/treeview.h
+++ b/frontends/gtk/treeview.h
diff --git a/gtk/viewdata.c b/frontends/gtk/viewdata.c
index 55b25467e..55b25467e 100644
--- a/gtk/viewdata.c
+++ b/frontends/gtk/viewdata.c
diff --git a/gtk/viewdata.h b/frontends/gtk/viewdata.h
index 1767b4821..1767b4821 100644
--- a/gtk/viewdata.h
+++ b/frontends/gtk/viewdata.h
diff --git a/gtk/viewsource.c b/frontends/gtk/viewsource.c
index 554cfbf39..554cfbf39 100644
--- a/gtk/viewsource.c
+++ b/frontends/gtk/viewsource.c
diff --git a/gtk/viewsource.h b/frontends/gtk/viewsource.h
index bba878874..bba878874 100644
--- a/gtk/viewsource.h
+++ b/frontends/gtk/viewsource.h
diff --git a/gtk/warn.h b/frontends/gtk/warn.h
index d24f55438..d24f55438 100644
--- a/gtk/warn.h
+++ b/frontends/gtk/warn.h
diff --git a/gtk/window.c b/frontends/gtk/window.c
index de333d1b0..de333d1b0 100644
--- a/gtk/window.c
+++ b/frontends/gtk/window.c
diff --git a/gtk/window.h b/frontends/gtk/window.h
index c604bf3f7..c604bf3f7 100644
--- a/gtk/window.h
+++ b/frontends/gtk/window.h
diff --git a/monkey/401login.c b/frontends/monkey/401login.c
index 8b4d33d7d..8b4d33d7d 100644
--- a/monkey/401login.c
+++ b/frontends/monkey/401login.c
diff --git a/monkey/401login.h b/frontends/monkey/401login.h
index e78355ea2..e78355ea2 100644
--- a/monkey/401login.h
+++ b/frontends/monkey/401login.h
diff --git a/monkey/Makefile.target b/frontends/monkey/Makefile
index 5813573c8..86f1d912e 100644
--- a/monkey/Makefile.target
+++ b/frontends/monkey/Makefile
@@ -7,17 +7,6 @@
 # Monkey flag setup (using pkg-config)
 # ----------------------------------------------------------------------------
 
-
-# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
-NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
-NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
-NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
-NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
-NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
-NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
-NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
-
-
 CWARNFLAGS += -Werror
 
 CFLAGS += -std=c99 -Dmonkey -Dnsmonkey -g \
@@ -30,19 +19,6 @@ CFLAGS += -std=c99 -Dmonkey -Dnsmonkey -g \
 
 LDFLAGS += -lm
 
-# non optional pkg-configed libs
-$(eval $(call pkg_config_find_and_add,libcurl,Curl ))
-$(eval $(call pkg_config_find_and_add,openssl,OpenSSL))
-
-# optional pkg-config configured libraries
-$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG))
-$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
-$(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,MOZJS,mozjs185,JavaScript))
-$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
-
 # ---------------------------------------------------------------------------
 # Windows flag setup
 # ---------------------------------------------------------------------------
@@ -56,15 +32,14 @@ endif
 # ----------------------------------------------------------------------------
 
 # S_MONKEY are sources purely for the MONKEY build
-S_MONKEY := main.c filetype.c schedule.c bitmap.c plot.c browser.c \
+S_FRONTEND := main.c filetype.c schedule.c bitmap.c plot.c browser.c \
 	download.c 401login.c cert.c layout.c dispatch.c fetch.c
 
-S_MONKEY := $(addprefix monkey/,$(S_MONKEY))
 
 # This is the final source build list
 # Note this is deliberately *not* expanded here as common and image
 #   are not yet available
-SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_MONKEY)
+SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_FRONTEND)
 EXETARGET := nsmonkey
 
 # ----------------------------------------------------------------------------
diff --git a/monkey/Makefile.defaults b/frontends/monkey/Makefile.defaults
index d6a90a3dc..d6a90a3dc 100644
--- a/monkey/Makefile.defaults
+++ b/frontends/monkey/Makefile.defaults
diff --git a/monkey/bitmap.c b/frontends/monkey/bitmap.c
index 5605073ba..5605073ba 100644
--- a/monkey/bitmap.c
+++ b/frontends/monkey/bitmap.c
diff --git a/monkey/bitmap.h b/frontends/monkey/bitmap.h
index e293ce93f..e293ce93f 100644
--- a/monkey/bitmap.h
+++ b/frontends/monkey/bitmap.h
diff --git a/monkey/browser.c b/frontends/monkey/browser.c
index dfd2dcf6c..dfd2dcf6c 100644
--- a/monkey/browser.c
+++ b/frontends/monkey/browser.c
diff --git a/monkey/browser.h b/frontends/monkey/browser.h
index 32572742a..32572742a 100644
--- a/monkey/browser.h
+++ b/frontends/monkey/browser.h
diff --git a/monkey/cert.c b/frontends/monkey/cert.c
index ec1b1ce43..ec1b1ce43 100644
--- a/monkey/cert.c
+++ b/frontends/monkey/cert.c
diff --git a/monkey/cert.h b/frontends/monkey/cert.h
index 283817f3d..283817f3d 100644
--- a/monkey/cert.h
+++ b/frontends/monkey/cert.h
diff --git a/monkey/dispatch.c b/frontends/monkey/dispatch.c
index 563534d64..563534d64 100644
--- a/monkey/dispatch.c
+++ b/frontends/monkey/dispatch.c
diff --git a/monkey/dispatch.h b/frontends/monkey/dispatch.h
index dc6e50a0b..dc6e50a0b 100644
--- a/monkey/dispatch.h
+++ b/frontends/monkey/dispatch.h
diff --git a/monkey/download.c b/frontends/monkey/download.c
index 242136662..242136662 100644
--- a/monkey/download.c
+++ b/frontends/monkey/download.c
diff --git a/monkey/fetch.c b/frontends/monkey/fetch.c
index 86732cfce..86732cfce 100644
--- a/monkey/fetch.c
+++ b/frontends/monkey/fetch.c
diff --git a/monkey/fetch.h b/frontends/monkey/fetch.h
index f146e2ef8..f146e2ef8 100644
--- a/monkey/fetch.h
+++ b/frontends/monkey/fetch.h
diff --git a/monkey/filetype.c b/frontends/monkey/filetype.c
index d5517bf06..d5517bf06 100644
--- a/monkey/filetype.c
+++ b/frontends/monkey/filetype.c
diff --git a/monkey/filetype.h b/frontends/monkey/filetype.h
index 6c16db01b..6c16db01b 100644
--- a/monkey/filetype.h
+++ b/frontends/monkey/filetype.h
diff --git a/monkey/layout.c b/frontends/monkey/layout.c
index 401ca158c..401ca158c 100644
--- a/monkey/layout.c
+++ b/frontends/monkey/layout.c
diff --git a/monkey/layout.h b/frontends/monkey/layout.h
index 1e713c27f..1e713c27f 100644
--- a/monkey/layout.h
+++ b/frontends/monkey/layout.h
diff --git a/monkey/main.c b/frontends/monkey/main.c
index ff70bda71..ff70bda71 100644
--- a/monkey/main.c
+++ b/frontends/monkey/main.c
diff --git a/monkey/options.h b/frontends/monkey/options.h
index 57cce7e1f..57cce7e1f 100644
--- a/monkey/options.h
+++ b/frontends/monkey/options.h
diff --git a/monkey/plot.c b/frontends/monkey/plot.c
index 50f812480..50f812480 100644
--- a/monkey/plot.c
+++ b/frontends/monkey/plot.c
diff --git a/monkey/plot.h b/frontends/monkey/plot.h
index 3632bcf4a..3632bcf4a 100644
--- a/monkey/plot.h
+++ b/frontends/monkey/plot.h
diff --git a/monkey/res b/frontends/monkey/res
index ea9dff35c..ea9dff35c 120000
--- a/monkey/res
+++ b/frontends/monkey/res
diff --git a/monkey/schedule.c b/frontends/monkey/schedule.c
index 8c638c0b9..8c638c0b9 100644
--- a/monkey/schedule.c
+++ b/frontends/monkey/schedule.c
diff --git a/monkey/schedule.h b/frontends/monkey/schedule.h
index 14fad8247..14fad8247 100644
--- a/monkey/schedule.h
+++ b/frontends/monkey/schedule.h
diff --git a/riscos/401login.c b/frontends/riscos/401login.c
index e95a74809..e95a74809 100644
--- a/riscos/401login.c
+++ b/frontends/riscos/401login.c
diff --git a/riscos/Makefile.target b/frontends/riscos/Makefile
index e6e4b896f..6ed076800 100644
--- a/riscos/Makefile.target
+++ b/frontends/riscos/Makefile
@@ -7,30 +7,13 @@
 # RISC OS target setup
 # ----------------------------------------------------------------------------
 
-ifeq ($(HOST),riscos)
-  LDFLAGS += -Xlinker -symbols=$(OBJROOT)/sym -lz -lm -lcurl -lcares
-  LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet
-else
-  LDFLAGS += $(shell $(PKG_CONFIG) --libs libcares libcurl openssl)
-endif
+$(eval $(call pkg_config_find_and_add,libcares,Cares))
 
-$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny)))
 $(eval $(call feature_enabled,DRAW,-DWITH_DRAW,,Drawfile rendering))
 $(eval $(call feature_enabled,SPRITE,-DWITH_SPRITE,,Sprite rendering))
 $(eval $(call feature_enabled,ARTWORKS,-DWITH_ARTWORKS,,ArtWorks rendering))
 $(eval $(call feature_enabled,DRAW_EXPORT,-DWITH_DRAW_EXPORT,-lpencil,Drawfile export))
 
-NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
-NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
-NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
-NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
-NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
-$(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,MOZJS,mozjs185,JavaScript))
-$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
-
 
 TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \
 		!NetSurf/Resources/$(TPL)/Templates$(TPLEXT))
@@ -63,7 +46,7 @@ endif
 # ----------------------------------------------------------------------------
 
 # S_RISCOS are sources purely for the RISC OS build
-S_RISCOS := 401login.c assert.c bitmap.c buffer.c cookies.c configure.c	\
+S_FRONTEND := 401login.c assert.c bitmap.c buffer.c cookies.c configure.c \
 	dialog.c download.c filetype.c font.c				\
 	global_history.c gui.c help.c history.c hotlist.c iconbar.c	\
 	image.c menus.c message.c mouse.c palettes.c plotters.c		\
@@ -79,23 +62,22 @@ S_RISCOS := 401login.c assert.c bitmap.c buffer.c cookies.c configure.c	\
 	$(addprefix configure/,con_cache.c con_connect.c con_content.c	\
 	con_fonts.c con_home.c con_image.c con_inter.c con_language.c	\
 	con_secure.c con_theme.c)
-S_RISCOS := $(addprefix riscos/,$(S_RISCOS))
 
 # This is the final source build list
 # Note this is deliberately *not* expanded here as common and image
 #   are not yet available
-SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RISCOS)
+SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND)
 
 EXETARGET := !NetSurf/!RunImage$(EXEEXT)
 
 # The filter and target for split messages
 MESSAGES_FILTER=ro
 
-!NetSurf/!Run$(RUNEXT): riscos/scripts/Run $(EXETARGET)
+!NetSurf/!Run$(RUNEXT): $(FRONTEND_SOURCE_DIR)/scripts/Run $(EXETARGET)
 	$(VQ)echo " MAKERUN: $@"
 	$(Q)$(MAKERUN) $(EXETARGET) $< $@
 
-!NetSurf/!Help$(RUNEXT): riscos/scripts/Help
+!NetSurf/!Help$(RUNEXT): $(FRONTEND_SOURCE_DIR)/scripts/Help
 	$(VQ)echo "      CP: $@"
 	$(Q)cp $< $@
 
@@ -123,7 +105,7 @@ CLEANS += clean-run clean-help
 
 # Template objects
 TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these
-TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS))
+TPL_RISCOS := $(addprefix $(FRONTEND_SOURCE_DIR)/templates/,$(TPL_RISCOS))
 
 # Template target creation macro
 define compile_template
@@ -161,11 +143,11 @@ netsurf.zip: $(EXETARGET)
 	$(eval $@_TMPDIR := $(shell mktemp -d))
 	$(Q) $(RM) $@
 	$(Q) rsync --archive --verbose $(CURDIR)/!NetSurf $($@_TMPDIR)
-	$(Q) $(CURDIR)/utils/git-date.sh $(CURDIR)/riscos/distribution
-	$(Q) rsync --archive --verbose $(CURDIR)/riscos/distribution/!Boot $($@_TMPDIR)
-	$(Q) rsync --archive --verbose $(CURDIR)/riscos/distribution/!System $($@_TMPDIR)
-	$(Q) rsync --archive --verbose $(CURDIR)/riscos/distribution/3rdParty $($@_TMPDIR)
-	$(Q) cp $(CURDIR)/riscos/distribution/ReadMe $($@_TMPDIR)
-	$(Q) cp $(CURDIR)/riscos/distribution/LeesMij $($@_TMPDIR)
+	$(Q) $(CURDIR)/utils/git-date.sh $(FRONTEND_SOURCE_DIR)/distribution
+	$(Q) rsync --archive --verbose $(FRONTEND_SOURCE_DIR)/distribution/!Boot $($@_TMPDIR)
+	$(Q) rsync --archive --verbose $(FRONTEND_SOURCE_DIR)/distribution/!System $($@_TMPDIR)
+	$(Q) rsync --archive --verbose $(FRONTEND_SOURCE_DIR)/distribution/3rdParty $($@_TMPDIR)
+	$(Q) cp $(FRONTEND_SOURCE_DIR)/distribution/ReadMe $($@_TMPDIR)
+	$(Q) cp $(FRONTEND_SOURCE_DIR)/distribution/LeesMij $($@_TMPDIR)
 	$(Q) cd $($@_TMPDIR) && /opt/netsurf/arm-unknown-riscos/env/bin/zip -9vr\, $(CURDIR)/$@ *
 	$(Q) $(RM) -rf $($@_TMPDIR)
diff --git a/riscos/Makefile.defaults b/frontends/riscos/Makefile.defaults
index f719ee3de..aed361631 100644
--- a/riscos/Makefile.defaults
+++ b/frontends/riscos/Makefile.defaults
@@ -14,6 +14,10 @@ NETSURF_USE_DRAW := YES
 # Valid options: YES, NO
 NETSURF_USE_SPRITE := 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 AWRender for displaying ArtWorks files
 # Valid options: YES, NO
 NETSURF_USE_ARTWORKS := YES
diff --git a/riscos/assert.c b/frontends/riscos/assert.c
index 50b8f5d54..50b8f5d54 100644
--- a/riscos/assert.c
+++ b/frontends/riscos/assert.c
diff --git a/riscos/bitmap.c b/frontends/riscos/bitmap.c
index cc4be590c..cc4be590c 100644
--- a/riscos/bitmap.c
+++ b/frontends/riscos/bitmap.c
diff --git a/riscos/bitmap.h b/frontends/riscos/bitmap.h
index 3aca30de6..3aca30de6 100644
--- a/riscos/bitmap.h
+++ b/frontends/riscos/bitmap.h
diff --git a/riscos/buffer.c b/frontends/riscos/buffer.c
index 7176c1c1c..7176c1c1c 100644
--- a/riscos/buffer.c
+++ b/frontends/riscos/buffer.c
diff --git a/riscos/buffer.h b/frontends/riscos/buffer.h
index a683c324c..a683c324c 100644
--- a/riscos/buffer.h
+++ b/frontends/riscos/buffer.h
diff --git a/riscos/configure.c b/frontends/riscos/configure.c
index 9d28616ec..9d28616ec 100644
--- a/riscos/configure.c
+++ b/frontends/riscos/configure.c
diff --git a/riscos/configure.h b/frontends/riscos/configure.h
index c190a6d0c..c190a6d0c 100644
--- a/riscos/configure.h
+++ b/frontends/riscos/configure.h
diff --git a/riscos/configure/con_cache.c b/frontends/riscos/configure/con_cache.c
index 730d6f82f..730d6f82f 100644
--- a/riscos/configure/con_cache.c
+++ b/frontends/riscos/configure/con_cache.c
diff --git a/riscos/configure/con_connect.c b/frontends/riscos/configure/con_connect.c
index 9515c5d6f..9515c5d6f 100644
--- a/riscos/configure/con_connect.c
+++ b/frontends/riscos/configure/con_connect.c
diff --git a/riscos/configure/con_content.c b/frontends/riscos/configure/con_content.c
index 50bbd15ef..50bbd15ef 100644
--- a/riscos/configure/con_content.c
+++ b/frontends/riscos/configure/con_content.c
diff --git a/riscos/configure/con_fonts.c b/frontends/riscos/configure/con_fonts.c
index 280312843..280312843 100644
--- a/riscos/configure/con_fonts.c
+++ b/frontends/riscos/configure/con_fonts.c
diff --git a/riscos/configure/con_home.c b/frontends/riscos/configure/con_home.c
index ea8e243ed..ea8e243ed 100644
--- a/riscos/configure/con_home.c
+++ b/frontends/riscos/configure/con_home.c
diff --git a/riscos/configure/con_image.c b/frontends/riscos/configure/con_image.c
index 49dd4f76d..49dd4f76d 100644
--- a/riscos/configure/con_image.c
+++ b/frontends/riscos/configure/con_image.c
diff --git a/riscos/configure/con_inter.c b/frontends/riscos/configure/con_inter.c
index 7ab912c54..7ab912c54 100644
--- a/riscos/configure/con_inter.c
+++ b/frontends/riscos/configure/con_inter.c
diff --git a/riscos/configure/con_language.c b/frontends/riscos/configure/con_language.c
index 2030c65c0..2030c65c0 100644
--- a/riscos/configure/con_language.c
+++ b/frontends/riscos/configure/con_language.c
diff --git a/riscos/configure/con_secure.c b/frontends/riscos/configure/con_secure.c
index 9c8a846c3..9c8a846c3 100644
--- a/riscos/configure/con_secure.c
+++ b/frontends/riscos/configure/con_secure.c
diff --git a/riscos/configure/con_theme.c b/frontends/riscos/configure/con_theme.c
index fb0d3dfb0..fb0d3dfb0 100644
--- a/riscos/configure/con_theme.c
+++ b/frontends/riscos/configure/con_theme.c
diff --git a/riscos/configure/configure.h b/frontends/riscos/configure/configure.h
index e5cdb392e..e5cdb392e 100644
--- a/riscos/configure/configure.h
+++ b/frontends/riscos/configure/configure.h
diff --git a/riscos/content-handlers/artworks.c b/frontends/riscos/content-handlers/artworks.c
index b6f7a0d08..b6f7a0d08 100644
--- a/riscos/content-handlers/artworks.c
+++ b/frontends/riscos/content-handlers/artworks.c
diff --git a/riscos/content-handlers/artworks.h b/frontends/riscos/content-handlers/artworks.h
index 67832cc54..67832cc54 100644
--- a/riscos/content-handlers/artworks.h
+++ b/frontends/riscos/content-handlers/artworks.h
diff --git a/riscos/content-handlers/awrender.s b/frontends/riscos/content-handlers/awrender.s
index 5bcafe520..5bcafe520 100644
--- a/riscos/content-handlers/awrender.s
+++ b/frontends/riscos/content-handlers/awrender.s
diff --git a/riscos/content-handlers/draw.c b/frontends/riscos/content-handlers/draw.c
index f2bee16dc..f2bee16dc 100644
--- a/riscos/content-handlers/draw.c
+++ b/frontends/riscos/content-handlers/draw.c
diff --git a/riscos/content-handlers/draw.h b/frontends/riscos/content-handlers/draw.h
index 9f5baf6dc..9f5baf6dc 100644
--- a/riscos/content-handlers/draw.h
+++ b/frontends/riscos/content-handlers/draw.h
diff --git a/riscos/content-handlers/sprite.c b/frontends/riscos/content-handlers/sprite.c
index 12fed4931..12fed4931 100644
--- a/riscos/content-handlers/sprite.c
+++ b/frontends/riscos/content-handlers/sprite.c
diff --git a/riscos/content-handlers/sprite.h b/frontends/riscos/content-handlers/sprite.h
index ab6d312a5..ab6d312a5 100644
--- a/riscos/content-handlers/sprite.h
+++ b/frontends/riscos/content-handlers/sprite.h
diff --git a/riscos/cookies.c b/frontends/riscos/cookies.c
index 93c9f39cf..93c9f39cf 100644
--- a/riscos/cookies.c
+++ b/frontends/riscos/cookies.c
diff --git a/riscos/cookies.h b/frontends/riscos/cookies.h
index b7313393e..b7313393e 100644
--- a/riscos/cookies.h
+++ b/frontends/riscos/cookies.h
diff --git a/riscos/dialog.c b/frontends/riscos/dialog.c
index d4356086d..d4356086d 100644
--- a/riscos/dialog.c
+++ b/frontends/riscos/dialog.c
diff --git a/riscos/dialog.h b/frontends/riscos/dialog.h
index 463048436..463048436 100644
--- a/riscos/dialog.h
+++ b/frontends/riscos/dialog.h
diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb
index 485bd521d..485bd521d 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb
diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Help,feb b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Help,feb
index 35eeeb31b..35eeeb31b 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/!Help,feb
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Help,feb
diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Run,feb b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Run,feb
index 8aead9733..8aead9733 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/!Run,feb
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Run,feb
diff --git a/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb b/frontends/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb
index 61752af99..61752af99 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb
diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9
index b71a51cf3..b71a51cf3 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9
diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9
index e43f88c89..e43f88c89 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9
diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank b/frontends/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank
index 898dc5872..898dc5872 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank
diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb
index ec348b0e9..ec348b0e9 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb
diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb
index 7766cc928..7766cc928 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb
diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta
index 2de40bd7c..2de40bd7c 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta
diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help
index aad9bf0b1..aad9bf0b1 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help
diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages
index 366122292..366122292 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages
diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec
index 22f910ad9..22f910ad9 100644
--- a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec
+++ b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Boot,feb b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Boot,feb
index 7c0c46241..7c0c46241 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/!Boot,feb
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Boot,feb
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Help b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Help
index 8c0488185..8c0488185 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/!Help
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Help
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Run,feb b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Run,feb
index bd70e96ac..bd70e96ac 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/!Run,feb
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Run,feb
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Sprites,ff9 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites,ff9
index 3eb5b44b7..3eb5b44b7 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/!Sprites,ff9
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites,ff9
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Sprites11,ff9 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites11,ff9
index 48986b41e..48986b41e 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/!Sprites11,ff9
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites11,ff9
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Sprites22,ff9 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites22,ff9
index 63a6e6122..63a6e6122 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/!Sprites22,ff9
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites22,ff9
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1
index bdf5d3b67..bdf5d3b67 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/CentEuro b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/CentEuro
index 5ab69ff2e..5ab69ff2e 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/CentEuro
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/CentEuro
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillic b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillic
index 670fd6cdc..670fd6cdc 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillic
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillic
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Roman b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Roman
index 254579e2c..254579e2c 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Roman
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Roman
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainian b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainian
index a220587ba..a220587ba 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainian
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainian
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/BigFive b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/BigFive
index c659cef19..c659cef19 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/BigFive
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/BigFive
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646]
index cd92b5486..cd92b5486 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429]
index 74002a168..74002a168 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old]
index 00e2d1096..00e2d1096 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB]
index c293f93d6..c293f93d6 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV]
index e0b4bcadb..e0b4bcadb 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe]
index 7d4646905..7d4646905 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE]
index a6b091a22..a6b091a22 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE]
index 9bd24ab29..9bd24ab29 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K]
index 20ce8d498..20ce8d498 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R]
index 21d2a479b..21d2a479b 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE]
index a2e284e1b..a2e284e1b 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT]
index e076e2517..e076e2517 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988]
index 3b43719ce..3b43719ce 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt]
index 73ce49e17..73ce49e17 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT]
index f1ae81962..f1ae81962 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES]
index 674fc2d70..674fc2d70 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO]
index fc92892ee..fc92892ee 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR]
index 8dd604679..8dd604679 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU]
index 65300b2c5..65300b2c5 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic]
index c47689914..c47689914 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937]
index 93453f5de..93453f5de 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr]
index 9740e784e..9740e784e 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226]
index a677dfc3d..a677dfc3d 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312]
index 679608ad2..679608ad2 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208]
index 532b1f4f3..532b1f4f3 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001]
index 36186c864..36186c864 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212]
index f5343a30e..f5343a30e 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1]
index da07f45d3..da07f45d3 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2]
index 44ee24c91..44ee24c91 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3]
index a8464e5aa..a8464e5aa 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4]
index a8f3e3270..a8f3e3270 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5]
index 535b0f4b5..535b0f4b5 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6]
index 7bfb2b1d4..7bfb2b1d4 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7]
index be14c7279..be14c7279 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1]
index 97e6b1106..97e6b1106 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2]
index b753c40fe..b753c40fe 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3]
index 88d477886..88d477886 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4]
index a40662d45..a40662d45 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek]
index c42397388..c42397388 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic]
index 4507f467a..4507f467a 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew]
index 70f39cca6..70f39cca6 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill]
index 8ff0115e4..8ff0115e4 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5]
index 6381e607e..6381e607e 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup]
index a320c7fe8..a320c7fe8 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937]
index dff6ccba4..dff6ccba4 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai]
index d74377759..d74377759 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6]
index 4e3e4f313..4e3e4f313 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami]
index 4dfd9188c..4dfd9188c 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7]
index 256a88e76..256a88e76 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh]
index b5e00509f..b5e00509f 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami]
index 15734c036..15734c036 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew]
index a6593b071..a6593b071 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8]
index c15713e82..c15713e82 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9]
index 5bf449d58..5bf449d58 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10]
index e8ba925d3..e8ba925d3 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10]
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10]
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/KOI8-R b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/KOI8-R
index 8063cd4bc..8063cd4bc 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/KOI8-R
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/KOI8-R
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250
index 7a0d35ceb..7a0d35ceb 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251
index 3d6009cab..3d6009cab 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252
index 6d3bf293d..6d3bf293d 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253
index 50a48be13..50a48be13 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254
index 45ecfe907..45ecfe907 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256
index 7fc95a92f..7fc95a92f 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866
index cd214d24b..cd214d24b 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874
index 26a6fc8c3..26a6fc8c3 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932
index 2c0c111f9..2c0c111f9 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932
diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Files/Aliases b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Files/Aliases
index 8978ede4c..8978ede4c 100644
--- a/riscos/distribution/!Boot/Resources/!Unicode/Files/Aliases
+++ b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Files/Aliases
diff --git a/riscos/distribution/!System/310/Modules/CryptRand,ffa b/frontends/riscos/distribution/!System/310/Modules/CryptRand,ffa
index f403843b3..f403843b3 100644
--- a/riscos/distribution/!System/310/Modules/CryptRand,ffa
+++ b/frontends/riscos/distribution/!System/310/Modules/CryptRand,ffa
diff --git a/riscos/distribution/!System/310/Modules/Iconv,ffa b/frontends/riscos/distribution/!System/310/Modules/Iconv,ffa
index 8a9cc3adb..8a9cc3adb 100644
--- a/riscos/distribution/!System/310/Modules/Iconv,ffa
+++ b/frontends/riscos/distribution/!System/310/Modules/Iconv,ffa
diff --git a/riscos/distribution/!System/310/Modules/Network/URI,ffa b/frontends/riscos/distribution/!System/310/Modules/Network/URI,ffa
index 431535e21..431535e21 100644
--- a/riscos/distribution/!System/310/Modules/Network/URI,ffa
+++ b/frontends/riscos/distribution/!System/310/Modules/Network/URI,ffa
diff --git a/riscos/distribution/!System/310/Modules/SharedULib,ffa b/frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa
index 8dd0dd2c9..8dd0dd2c9 100755
--- a/riscos/distribution/!System/310/Modules/SharedULib,ffa
+++ b/frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa
diff --git a/riscos/distribution/!System/310/Modules/Tinct,ffa b/frontends/riscos/distribution/!System/310/Modules/Tinct,ffa